merge of '6290a5cbe0263dc9f36d8173dc82cfd5253fcba4'
authorJan Lübbe <jluebbe@debian.org>
Sun, 7 Oct 2007 16:28:48 +0000 (16:28 +0000)
committerJan Lübbe <jluebbe@debian.org>
Sun, 7 Oct 2007 16:28:48 +0000 (16:28 +0000)
     and 'f932fa3f7eccd6af6a193dce671ebe48f0d075ff'


Trivial merge