Merge branch 'master' into negoex
authorLuke Howard <lukeh@padl.com>
Wed, 5 Oct 2011 01:56:19 +0000 (12:56 +1100)
committerLuke Howard <lukeh@padl.com>
Wed, 5 Oct 2011 01:56:19 +0000 (12:56 +1100)

Trivial merge