Merge remote branch 'kc/new/bug_5058' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Fri, 12 Nov 2010 22:33:41 +0000 (11:33 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Fri, 12 Nov 2010 22:33:41 +0000 (11:33 +1300)
commitddd4d443dd9ed4e030378f81a19f506a942bc897
tree270dcc06626c1cdeb30b78512576ba449dd405a1
parentf2ea320aadb91ec769894f45100643450c3c82ae
parentd39dd6d857af999430df0fbe571a5bffde7a287d
Merge remote branch 'kc/new/bug_5058' into kcmaster