Merge remote branch 'kc/new/bug_6058' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Wed, 6 Apr 2011 03:35:28 +0000 (15:35 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Wed, 6 Apr 2011 03:35:28 +0000 (15:35 +1200)
commit5bdfefc7e1962a64079eb119d5229bfa28cf979d
treee4744ec1d969d57ff2955e07ed5331f299b4368a
parent827c575b18c0914045b2855b066277f104e22ded
parentce71043216f843ad1b1d2fb254db4dd2635e1066
Merge remote branch 'kc/new/bug_6058' into kcmaster