Merge remote branch 'kc/new/bug_5370' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 8 Nov 2010 21:49:01 +0000 (10:49 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 8 Nov 2010 21:49:01 +0000 (10:49 +1300)
commit2a4c3d48d07d946d9846681f9ee2a31fcac0a18a
tree4d1ae45bb306206453fcfd9b99619448cc3de1cc
parentce54fe0323a8ab523ae8992ff269bf82fea2dd10
parentd829dc1c6ab8fb20426c0cd377456d02fdac6598
Merge remote branch 'kc/new/bug_5370' into kcmaster