Merge branch 'upstream-fixes' master
authorMichael Walle <michael@walle.cc>
Mon, 24 May 2010 22:02:57 +0000 (00:02 +0200)
committerMichael Walle <michael@walle.cc>
Mon, 24 May 2010 22:02:57 +0000 (00:02 +0200)

Trivial merge