Merge commit 'metze/master-for-ronnie'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Tue, 12 Jan 2010 20:01:40 +0000 (07:01 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Tue, 12 Jan 2010 20:01:40 +0000 (07:01 +1100)

Trivial merge