Merge branch 'upstream'
authorGerfried Fuchs <rhonda@debian.at>
Wed, 17 Feb 2010 19:26:43 +0000 (20:26 +0100)
committerGerfried Fuchs <rhonda@debian.at>
Wed, 17 Feb 2010 19:26:43 +0000 (20:26 +0100)
commit607afdb16c4ac0a31b43f3039eb64fd889c544b5
tree9a88fa508a0f1ebf36bab826002eaec477fc2f56
parente8db415fbea1c58d2abcb1e10bb6d8af6de80de6
parentec2a805cf8dbfde9f1223a9a60eaf1bf4653d6e7
Merge branch 'upstream'