Merge remote branch 'kc/new/bug_1953' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Sun, 27 Feb 2011 19:45:05 +0000 (08:45 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 27 Feb 2011 19:45:05 +0000 (08:45 +1300)
commitbf704ce989a1d4e562f4d9f2b844158b7b19ce78
tree09416348653a8a2b0388b676cac9b67a37d73a35
parent0b961c0ae0dd03be18301852be37f7173be87856
parent55af15be84334cc6735f2377dbb3e9060d2cbfdd
Merge remote branch 'kc/new/bug_1953' into kcmaster