Merge remote-tracking branch 'kc/new/bug_4002' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Tue, 16 Aug 2011 22:34:55 +0000 (10:34 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Tue, 16 Aug 2011 22:34:55 +0000 (10:34 +1200)
commit965438cc366267a5571280464a0ddef76c7e613e
treeb43b857cb30287da23efc0eae9cc21d7c3105b02
parenta3e55473555ee4b3a3dd4af81f1b163519278775
parentd0c9592592c0bd6c529915a9fbc04476f9b52851
Merge remote-tracking branch 'kc/new/bug_4002' into kcmaster