Merge remote branch 'kc/new/bug_5105' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 11 Nov 2010 08:33:48 +0000 (21:33 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 11 Nov 2010 08:33:48 +0000 (21:33 +1300)
commit235cf872a5c40a0baae554bdb28ec98c4520c528
tree6b79198119c9f0c3585b565308c77440a2dbe00f
parent7ecf2c2dc42d443d819ed04e3a11065f2802d51a
parent5ebb5d4f4cd7709751e5f201fada5351d0e9c29e
Merge remote branch 'kc/new/bug_5105' into kcmaster