[duplicity/f14: 3/3] Merge remote branch 'origin/master' into f14

[Robert Scheck]

commit 3bd5f201ec6073ae2fa2aa8586c35513777a4e42
Merge: 819e026 2346ad0
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Jul 17 22:30:20 2011 +0200

    Merge remote branch 'origin/master' into f14

 .gitignore                          |    2 +-
 duplicity-0.6.14-optparse_el4.patch | 1574 +++++++++++++++++++++++++++++++++++
 duplicity-0.6.14-python23.patch     |   60 ++
 duplicity.spec                      |   15 +-
 sources                             |    2 +-
 5 files changed, 1650 insertions(+), 3 deletions(-)
---