Merge remote-tracking branch 'kc/new/bug_6678' into kcmaster

This commit is contained in:
Chris Cormack 2011-08-21 19:56:57 +12:00
commit dff9277d3d