merged from upstream master
authorLars Wirzenius <lars@catalyst.net.nz>
Wed, 26 May 2010 04:14:04 +0000 (16:14 +1200)
committerLars Wirzenius <lars@catalyst.net.nz>
Wed, 26 May 2010 04:14:04 +0000 (16:14 +1200)

Trivial merge