Merge remote branch 'kc/new/bug_5942' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Wed, 6 Apr 2011 03:35:16 +0000 (15:35 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Wed, 6 Apr 2011 03:35:16 +0000 (15:35 +1200)
commit3291784a88676cadb4ab86b936d14903da01a69e
treebc65a4f627eb20f7fc14a6351709e224d8009461
parente9db636e6321000216151e3bdea400fb638dd288
parent132743f66bc07f6b8799835aac6cf440430bd44e
Merge remote branch 'kc/new/bug_5942' into kcmaster