Merge branch 'trans3'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Tue, 15 Dec 2009 10:00:22 +0000 (21:00 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Tue, 15 Dec 2009 10:00:22 +0000 (21:00 +1100)

Trivial merge