Merge remote branch 'kc/new/bug_5769' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 17 Feb 2011 21:43:42 +0000 (10:43 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 17 Feb 2011 21:43:42 +0000 (10:43 +1300)
commitc43aac22a2cc7c511820d5d6e791daed6c01ee46
treec885c82d6fd44c3fd0cf2bfb372e7fb222289da4
parent92f52dc8509664dc305e386a198428146566dbb3
parented2b583eb10cb81c26c43714572bbb2c85d5797c
Merge remote branch 'kc/new/bug_5769' into kcmaster