[duplicity/f13/master: 5/5] Merge remote branch 'origin/master' into f13

[Robert Scheck]

commit f15afa42df0a64d9c35585bf6d5d2bedf7f0ace0
Merge: d269808 185851e
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon Sep 13 01:40:43 2010 +0200

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

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