Merge remote-tracking branch 'kc/new/bug_6351' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 1 Sep 2011 09:28:41 +0000 (21:28 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 1 Sep 2011 09:28:41 +0000 (21:28 +1200)
commit6be9d2b27dd47c859eb6ab0cfd873b2059206986
treec4c98552b6fb4dfdf96dc746a363107ec7d1d1d5
parent720e3012a87ca437c17e864f159138304ed0c006
parentcb6c40faf78fa25b752c3c51abc98435e9afe4cb
Merge remote-tracking branch 'kc/new/bug_6351' into kcmaster