merge of '57d7542ed0fd0b8b1f119cea4a56f425d875a4a0'
authorJan Lübbe <jluebbe@debian.org>
Tue, 25 Sep 2007 19:11:09 +0000 (19:11 +0000)
committerJan Lübbe <jluebbe@debian.org>
Tue, 25 Sep 2007 19:11:09 +0000 (19:11 +0000)
commit83119b9a73595489e8d25637d68ccb01b545097c
treed1955bbd23789f0c9079dc399c0a8c96262a8bb6
parent805aaee5708afe12a543d86a53b500badcd18e0b
parent51ed3c2bc00bd22980d138bf9cd1848135da9ffd
Merge ... '57d7542ed0fd0b8b1f119cea4a56f425d875a4a0'
     and '881b243754238663caa684adaf1bfed923a1d0e6'