Merge remote-tracking branch 'kc/new/bug_6755' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 22 Sep 2011 23:34:28 +0000 (11:34 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 22 Sep 2011 23:34:28 +0000 (11:34 +1200)
commit2c09527abe0322c707c8a01a2195b7385d31b418
treecce37f250ba643f19100e7b878cc69892f5097d0
parentc5dfe7bb35d2b23a73fe7401cff01294852d36f7
parent8e7b1636086b6689e72905c5008841e585c04e8e
Merge remote-tracking branch 'kc/new/bug_6755' into kcmaster