Merge branch 'upstream'
authorGerfried Fuchs <rhonda@debian.at>
Wed, 14 Jul 2010 19:38:19 +0000 (21:38 +0200)
committerGerfried Fuchs <rhonda@debian.at>
Wed, 14 Jul 2010 19:38:19 +0000 (21:38 +0200)
commitbc465ddcdbbbc2ceae0cf460fa5a2c6b02aba990
tree3017f3f327f1a924623a995597927d5ab43966b8
parentf894f11ad3300a6fbf3544e5acd0c79e4dfdee47
parentb49a491544fbd21beb14a44f6ccf5983b6a2f8dc
Merge branch 'upstream'