From b1bb11fd3186c9379a3fb904c00b86ddceb44233 Mon Sep 17 00:00:00 2001
From: Joerg Jaspert <joerg@debian.org>
Date: Fri, 21 Mar 2008 15:23:23 +0100
Subject: [PATCH] Merge from aj

-- 
2.47.3