Merge branch 'upstream-fixes'
authorMichael Walle <michael@walle.cc>
Fri, 7 May 2010 20:51:20 +0000 (22:51 +0200)
committerMichael Walle <michael@walle.cc>
Fri, 7 May 2010 20:51:20 +0000 (22:51 +0200)

Trivial merge