Merge branch 'upstream'
authorGerfried Fuchs <rhonda@debian.at>
Wed, 14 Jul 2010 19:42:19 +0000 (21:42 +0200)
committerGerfried Fuchs <rhonda@debian.at>
Wed, 14 Jul 2010 19:42:19 +0000 (21:42 +0200)
commit971ca7559abc33e92afe979820f81785ca80025a
treefb5575425575f0c2f54b2d042eafdecd5355d4f3
parent7772a97708eea70899b86e98d23473b436438148
parent91e5667aae786e39a33ea9d47a27b8e3e0f32a38
Merge branch 'upstream'