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)
commit4e0405649d3a08f96a43bcda889c064f62f08713
tree86449d89ada8cf7c8a01ab7f7f10ad580c6f3d53
parentfd840e827a15b69782a0a0058c4b88de9d26c6d5
parent7acce5f93044bbd2a77c97243720a9ed3b91eedc
Merge branch 'upstream-fixes'