Merge remote branch 'kc/new/bug_5236' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 1 Nov 2010 22:10:39 +0000 (11:10 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 1 Nov 2010 22:10:39 +0000 (11:10 +1300)
commit9721610d916d3482b6de9e9fb80a4d1497c00379
tree8d514154c707b1f9f71e41c9747906ff9f53a850
parent5c4f27bd0df7b7557519660d752eeee3c9fb0c7c
parente7018d0eb6d066a54867d7c6d0993a34b9069c24
Merge remote branch 'kc/new/bug_5236' into kcmaster