Merge branch 'master' into merged_kickstart
authorMartin Schwenke <martin@meltin.net>
Fri, 24 Jul 2009 04:59:08 +0000 (14:59 +1000)
committerMartin Schwenke <martin@meltin.net>
Fri, 24 Jul 2009 04:59:08 +0000 (14:59 +1000)

Trivial merge