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

[Robert Scheck]

commit 5dbf47c8b1f8e63f016e6a52800b965d04955264
Merge: e296ff0 185851e
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon Sep 13 01:43:11 2010 +0200

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

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