Merge remote-tracking branch 'kc/new/bug_6170' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Sun, 29 May 2011 01:56:32 +0000 (13:56 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 29 May 2011 01:56:32 +0000 (13:56 +1200)
commit432777e83388d9ea3d9f9c123e684b6830cd05e3
tree0df614ab18dfd6fb15620bf9c329ec70bf06fd3e
parentd19998413a7a67798626400466e8adaee167a579
parentc97868ef6338d2dd41f9d75618c9d4ff9a0db8cd
Merge remote-tracking branch 'kc/new/bug_6170' into kcmaster