[duplicity/el4/master: 2/2] Merge remote branch 'origin/master' into el4

[Robert Scheck]

commit 4fc267e33390bbcd8d7b440ffc0c5f37d0173a27
Merge: e5d5fa2 a1ddc27
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Thu Dec 9 00:14:30 2010 +0100

    Merge remote branch 'origin/master' into el4

 .gitignore                      |    2 +-
 duplicity-0.6.10-python23.patch |   24 ------------------------
 duplicity.spec                  |    7 ++++---
 sources                         |    2 +-
 4 files changed, 6 insertions(+), 29 deletions(-)
---