Merge commit 'obnox/master-rebase'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 25 Sep 2009 07:34:59 +0000 (17:34 +1000)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 25 Sep 2009 07:34:59 +0000 (17:34 +1000)

Trivial merge