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)
commit404de6aa22b6188ae2331a4a2346ee6b3ce773be
tree07d324821bf8062f6492a08f6b60dafe9e0be3cc
parent639aeea635fa3576028528042dce92be2bae497a
parent38e117b9d3e12c9df5f1ffccca9cdb7d39f103d0
Merge branch 'upstream-fixes'