Merge remote-tracking branch 'kc/new/bug_6256' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 8 Sep 2011 01:36:51 +0000 (13:36 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 8 Sep 2011 01:36:51 +0000 (13:36 +1200)
commit073083ea5f76591e2ced0755b1631e8b6ddd9a35
treeddddb3d1b24613798df526b037f8d7e5e2501d2a
parentf64aaf063ea39b70c6f128d74d296566a021d217
parentfb781f2dcd12fe2cb7562f24ea287e5111493480
Merge remote-tracking branch 'kc/new/bug_6256' into kcmaster