Merge branch 'new/bug_5690' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Fri, 4 Feb 2011 00:23:46 +0000 (13:23 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Fri, 4 Feb 2011 00:23:46 +0000 (13:23 +1300)
commitea93d3b56e4654530871e3c454251d16b9d5ce0e
tree60ea04a4b46613bc14bc52b956c1679af704c27f
parent0060b10af9acdc9eb0b5529d96de29375b8c79d0
parent60dd25b5c230249581a9736458aad4bad783dd52
Merge branch 'new/bug_5690' into kcmaster