Merge remote branch 'galen/bug5308' into bug_5308
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 1 Nov 2010 19:52:43 +0000 (08:52 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 1 Nov 2010 19:52:43 +0000 (08:52 +1300)

Trivial merge