Merge remote branch 'kc/new/bug_5392' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Fri, 12 Nov 2010 17:47:26 +0000 (06:47 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Fri, 12 Nov 2010 17:47:26 +0000 (06:47 +1300)
commit5e95b28e4b45d09661fd05baddbdda4a4dc475a4
treebb7809dc4d7beb37d64a3a372aa8b4030a96d1dc
parent51eb4fa12ec316fb8bf249ec0ae9c96a56f4639e
parentbd93bfdbc4087166369ac0e7dbc146cb199ecceb
Merge remote branch 'kc/new/bug_5392' into kcmaster