Merge remote branch 'kc/new/bug_5327' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Tue, 18 Jan 2011 03:25:58 +0000 (16:25 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Tue, 18 Jan 2011 03:25:58 +0000 (16:25 +1300)
commit1144c92ffc040438df1229f216453b1987c031f0
treee240106e8a8234279888eb9e3536ad6616ec87fa
parentb3ac9e810e2c5d31c4e79e001bf679fd83ed27bc
parenteff21765f9784e09905042dd7080cbef099306d9
Merge remote branch 'kc/new/bug_5327' into kcmaster