merge of '6aa3a34371e0ba98066d355ab1bc9a3c72356bf0'
authorJan Lübbe <jluebbe@debian.org>
Wed, 11 Jun 2008 15:48:27 +0000 (15:48 +0000)
committerJan Lübbe <jluebbe@debian.org>
Wed, 11 Jun 2008 15:48:27 +0000 (15:48 +0000)
commit3ff424897ffa847b198072c53bf40ec06961a8ef
tree213ba1d74ff9a34c25f4ff80e1675495aaf951fc
parentce83493ea8d3feab3cc01e5343586f8f69439eba
parentebcfc2917b588f690f45d40a0dae97ab5bb2543c
Merge ... '6aa3a34371e0ba98066d355ab1bc9a3c72356bf0'
     and '99ed4d92c897fb19999e63a3d7eb3b5fae762ff3'