Merge branch 'upstream'
authorGerfried Fuchs <rhonda@debian.at>
Wed, 17 Feb 2010 19:24:08 +0000 (20:24 +0100)
committerGerfried Fuchs <rhonda@debian.at>
Wed, 17 Feb 2010 19:24:08 +0000 (20:24 +0100)
commit381403b63e52556173694d7dc2d02ac2371b61ff
tree600d15169fa5e5ea7728ce388ff39da1c56484a1
parentbdd330d442942d616f8aad8ec793eae863a6e25b
parent930803001074c64094176e2219dbef7da2b423f9
Merge branch 'upstream'