merge of '832167cf1cc0ab655072532b7c546a8a25821e44'
authorJan Lübbe <jluebbe@debian.org>
Tue, 22 Jul 2008 15:50:44 +0000 (15:50 +0000)
committerJan Lübbe <jluebbe@debian.org>
Tue, 22 Jul 2008 15:50:44 +0000 (15:50 +0000)
commitd389748f6ba4325a878f7e3c017b1905409c8700
treeefffc49e08a9587a3f32994aed777b995afa5a05
parent7d283cd8392336998ee9c7c980497b6f03ebca7a
parent721b1996622b7032acb6078f0a32d236901e6b3b
Merge ... '832167cf1cc0ab655072532b7c546a8a25821e44'
     and 'e4aab546c3b33577e2fb6bcfe199da5a98b4a9a3'