Merge branch 'staging'
authorGraeme Russ <graeme.russ@gmail.com>
Fri, 20 Jan 2012 14:22:48 +0000 (01:22 +1100)
committerGraeme Russ <graeme.russ@gmail.com>
Fri, 20 Jan 2012 14:22:48 +0000 (01:22 +1100)

Trivial merge