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

Mon Dec 26 15:44:40 UTC 2011

commit 0cd3b9efe03898f7be04b32503dd19ca8701b00d
Merge: 34c61e9 242ec95
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon Dec 26 16:44:29 2011 +0100

    Merge remote branch 'origin/master' into el6

 .gitignore                          |    3 +-
 duplicity-0.6.14-optparse_el4.patch | 1574 -----------------------------------
 duplicity-0.6.14-python23.patch     |   60 --
 duplicity-0.6.17-python24.patch     |   35 +
 duplicity.spec                      |   18 +-
 sources                             |    2 +-
 6 files changed, 45 insertions(+), 1647 deletions(-)
---