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

[Robert Scheck]

commit cb5449b44f8a82464bbae1cde65ee10d62abf0c6
Merge: 03c39a7 185851e
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon Sep 13 01:44:22 2010 +0200

    Merge remote branch 'origin/master' into el5
    
    Conflicts:
    	.gitignore
    	duplicity.spec
    	sources

 .gitignore     |    2 +-
 duplicity.spec |    8 +++++++-
 sources        |    2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)
---