Merge remote branch 'kc/new/bug_1953' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 28 Feb 2011 08:37:10 +0000 (21:37 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 28 Feb 2011 08:37:10 +0000 (21:37 +1300)
commit8e3fdc6d6b46bb368167b6ae2cb0ebbe590f5e00
treeb2420be4111d019f5484c7c4cf3c4c9fd77c14a2
parentedafbd941d14977cb98d07d2fd3fbba3b2a995ac
parent439d2224e1215fa876ff7c5a06f773003555a035
Merge remote branch 'kc/new/bug_1953' into kcmaster