Merge remote branch 'origin/master'
authorCharles Manning <cdhmanning@gmail.com>
Tue, 1 May 2012 08:19:58 +0000 (20:19 +1200)
committerCharles Manning <cdhmanning@gmail.com>
Tue, 1 May 2012 08:19:58 +0000 (20:19 +1200)

Trivial merge