Merge remote-tracking branch 'kc/new/bug_5683' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Wed, 1 Jun 2011 21:12:29 +0000 (09:12 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Wed, 1 Jun 2011 21:12:29 +0000 (09:12 +1200)
commitbbe37ed54f0129eeb8d72eee1328ab24797894ed
treefaa2ad9b85368ec1c9183c53019e8901a8d12b37
parent27ec47ba15978b82c75f792eb39cef9a43c1cf18
parent2468bab611e91a3e1d3477fecd8f4abc1b63a058
Merge remote-tracking branch 'kc/new/bug_5683' into kcmaster