Merge remote branch 'kc/master'
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 14 Oct 2010 20:50:18 +0000 (09:50 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 14 Oct 2010 20:50:18 +0000 (09:50 +1300)
commitf57ceeb8c56cfcae782db9802f5f6df8a2a1bc93
treecd477684ac6a9f560b7d380298c3921bdc87224e
parent29d17cab2ecea7f186998dd75ea33a61a7b92bc8
parent5cb133d9a3c3df00e897a3e32f9c8566be4fa249
Merge remote branch 'kc/master'