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

[Robert Scheck]

commit 041a92a6cef36286a2fbe818bff9171e86551f3f
Merge: bd5f469 2346ad0
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Jul 17 22:31:08 2011 +0200

    Merge remote branch 'origin/master' into el5

 .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(-)
---