merge of '5f2600b1acc33de2cbb3e1f80dfa05badd4beec1'
authorJan Lübbe <jluebbe@debian.org>
Tue, 14 Oct 2008 14:32:05 +0000 (14:32 +0000)
committerJan Lübbe <jluebbe@debian.org>
Tue, 14 Oct 2008 14:32:05 +0000 (14:32 +0000)
     and '7d56053e50a580363a8a600b8eb9cc6463548310'


Trivial merge