Merge remote branch 'kc/new/bug_4979' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Fri, 12 Nov 2010 17:47:45 +0000 (06:47 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Fri, 12 Nov 2010 17:47:45 +0000 (06:47 +1300)
commitf2ea320aadb91ec769894f45100643450c3c82ae
tree2948e32ceb17fd108a278ca0a29adf64722ccd5e
parent5e95b28e4b45d09661fd05baddbdda4a4dc475a4
parented0ccd9f574b1f4895fa51dfe6850215be39d8db
Merge remote branch 'kc/new/bug_4979' into kcmaster