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)
commit04cf1e3746b45227badc349752dafeaee74d4567
treecb2e5a54d327f4f9fcace818000f6f4ef035a589
parente5597c3e190b3e7f45b8550cd817a628e426378d
parent755eee92d56ca490407fe1fe623d846da44f42ca
Merge ... '6290a5cbe0263dc9f36d8173dc82cfd5253fcba4'
     and 'f932fa3f7eccd6af6a193dce671ebe48f0d075ff'