Merge remote branch 'kc/new/enh/bug_1997' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 13 Dec 2010 07:04:11 +0000 (20:04 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 13 Dec 2010 07:04:11 +0000 (20:04 +1300)
commit906a1a03ac023aae4f2f51ce72338ab2035e1d8d
treefd971a3bf9833e70cf30cfd8f388a14906ed1145
parent38a1526a740b506e87c0aa296014f2feb1c00c0f
parentddde74e10e355646cda62fc6138ab259aab56fcf
Merge remote branch 'kc/new/enh/bug_1997' into kcmaster