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)
commit6241d54c52b9ad1e8f1117b260cbbc86c4d37faa
treeaba39ae94a312ab5c7fff0c79fa4c9cf79fa7b8b
parentc74710b007d1af2f6b64b32295c96b080ca3776f
parentede20857ea5b3744a58ba2bdd73d56a117c8e210
merged from upstream master