Merge remote branch 'kc/new/bug_5162' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Tue, 2 Nov 2010 01:41:07 +0000 (14:41 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Tue, 2 Nov 2010 01:41:07 +0000 (14:41 +1300)
commit5fa376542d682b551e70eb5e591d7133e09bff20
tree41c2ee35ae5db6864d5a9c61349215543d8694cb
parente979344ea9db2ea91e9aa905bdcea527ac9fe2f2
parent33f3d4de1d279263845256b3c764ce2fa338ef7a
Merge remote branch 'kc/new/bug_5162' into kcmaster