From: Frank Lichtenheld Date: Fri, 20 Jun 2008 23:25:36 +0000 (+0200) Subject: Merge branch 'master' into ubuntu-master X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=3e2e3d70867be455d5562c017863420f5bc593ef;p=deb%2Fpackages.git Merge branch 'master' into ubuntu-master --- 3e2e3d70867be455d5562c017863420f5bc593ef