Merge remote branch 'kc/new/bug_6104' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 14 Apr 2011 06:30:38 +0000 (18:30 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 14 Apr 2011 06:30:38 +0000 (18:30 +1200)
commit97446f86ced2c2d6d4d7a11b97ed81a5a0a25d95
treec2d9fe8890936c6b1082111ba89b7a45749df1ea
parentc673f6cf4630c49d2adc007875059ff30ddc952a
parentb0374db5ffe1ef15a331eea3fd24b50fe8396b3b
Merge remote branch 'kc/new/bug_6104' into kcmaster