Merge branch 'upstream'
authorGerfried Fuchs <rhonda@debian.at>
Wed, 17 Feb 2010 19:23:57 +0000 (20:23 +0100)
committerGerfried Fuchs <rhonda@debian.at>
Wed, 17 Feb 2010 19:23:57 +0000 (20:23 +0100)
commit8e56a4fc26c4f805286ad5c62157cafbe37acc58
treeedb65badef6a7bc3c261d289d1d30112759548e0
parenta6c12e50628dd71ecc46e1724d1912689540f359
parenta79f6c17d0eb6d18dbbdb087868050426027bebb
Merge branch 'upstream'