Merge remote branch 'kc/new/bug_5327' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Tue, 18 Jan 2011 22:26:18 +0000 (11:26 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Tue, 18 Jan 2011 22:26:18 +0000 (11:26 +1300)
commit73f0857003a049a2359c42a99d34760330153a73
treea68fa88a5ec3ee2b745f5dee82a6e0ad8b94bd1f
parent22e5f27ff42d64f84971155f062db901ea3813f3
parent23f92a8f8dcded82bf5c3b319f373350a011e078
Merge remote branch 'kc/new/bug_5327' into kcmaster