Merge commit 'obnox/master-rebase'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Mon, 14 Sep 2009 22:05:33 +0000 (08:05 +1000)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Mon, 14 Sep 2009 22:05:33 +0000 (08:05 +1000)

Trivial merge