Merge commit 'obnox/master-rebase'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Thu, 11 Mar 2010 07:34:32 +0000 (18:34 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Thu, 11 Mar 2010 07:34:32 +0000 (18:34 +1100)

Trivial merge