Merge remote-tracking branch 'kc/new/bug_6712' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Sun, 28 Aug 2011 07:34:25 +0000 (19:34 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 28 Aug 2011 07:34:25 +0000 (19:34 +1200)
commit55326fc407ff041ae8abfa54683efd08f8e16f3e
tree30e974645852a1ef21165c501cd23f8806d9cba4
parent383d0d3a2108a0ebb784937addc85e7a854ea247
parentbd744e6f2af85110cefa8d9e613393a0a517185b
Merge remote-tracking branch 'kc/new/bug_6712' into kcmaster