Merge remote branch 'kc/new/bug_5563' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 3 Jan 2011 09:03:28 +0000 (22:03 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 3 Jan 2011 09:03:28 +0000 (22:03 +1300)
commit34c0fb876347e6ae48b9dfcc6c9d949655f8594a
tree9a69ccd0a1bc845c5cf7fc1aa4864d46682a0b15
parentc71a36fd27ece805705161149bb885aa3e4decdd
parent606f9784199722bd661d60be1944aa97c6a8971c
Merge remote branch 'kc/new/bug_5563' into kcmaster