[duplicity/el4/master: 37/37] Merge remote branch 'origin/master' into el4

[Robert Scheck]

commit 4b5257e7eb6a9a295808554ec34af848fdf9b7b5
Merge: e06b125 185851e
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon Sep 13 01:45:20 2010 +0200

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

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