Merge branch 'ronnie_merge'
authorMartin Schwenke <martin@meltin.net>
Wed, 8 Jul 2009 04:21:36 +0000 (14:21 +1000)
committerMartin Schwenke <martin@meltin.net>
Wed, 8 Jul 2009 04:21:36 +0000 (14:21 +1000)

Trivial merge