Merge remote branch 'kc/new/bug_6009' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Wed, 6 Apr 2011 07:28:54 +0000 (19:28 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Wed, 6 Apr 2011 07:28:54 +0000 (19:28 +1200)
commitf9658db163ca2c2533d47362f550b0157d49e5d7
tree2939ad1f2052f62f49762d5dbd9faace9116c578
parent0f4edffc16adacb439601f9051bacd89869018f7
parent0a43ba114d0fee9a478def455b926121442a0814
Merge remote branch 'kc/new/bug_6009' into kcmaster