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

[Robert Scheck]

commit 6f092ed74df35944007fa83263594941e94817db
Merge: 170aee1 185851e
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon Sep 13 01:42:07 2010 +0200

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

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