Merge remote-tracking branch 'kc/new/bug_6678' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Sun, 21 Aug 2011 07:56:57 +0000 (19:56 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 21 Aug 2011 07:56:57 +0000 (19:56 +1200)
commitdff9277d3dcc68d8cbea74ede5b8c7e5c0b339b0
treed2c52178a77b4a2e82200513c703c67226da301a
parent14a0c39e8439eeaa32d24deaa3d7b6601eff5570
parent142e75c94ade26000671d19bd7d729cec681ff8e
Merge remote-tracking branch 'kc/new/bug_6678' into kcmaster