Merge commit 'obnox/master-rebase'
authorRonnie sahlberg <ronniesahlberg@gmail.com>
Tue, 11 May 2010 09:44:11 +0000 (19:44 +1000)
committerRonnie sahlberg <ronniesahlberg@gmail.com>
Tue, 11 May 2010 09:44:11 +0000 (19:44 +1000)

Trivial merge