Merge remote branch 'kc/master' into new/bug_3013
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 7 Mar 2011 19:28:42 +0000 (08:28 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 7 Mar 2011 19:28:42 +0000 (08:28 +1300)

Trivial merge