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

[Robert Scheck]

commit 34c61e9d4a41492ed87a170bd04945c734812745
Merge: c8ab99d 2346ad0
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Jul 17 22:30:44 2011 +0200

    Merge remote branch 'origin/master' into el6

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