[duplicity/f14/master: 3/3] Merge remote branch 'origin/master' into f14

[Robert Scheck]

commit e1fe625847b278dad4017b9989902f42256bfa6a
Merge: 13e5b79 57f2fa1
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Oct 31 21:04:40 2010 +0100

    Merge remote branch 'origin/master' into f14
    
    Conflicts:
    	duplicity.spec

 duplicity-0.6.10-python23.patch |   24 ++++++++++++++++++++++++
 duplicity.spec                  |   12 +++++++++---
 2 files changed, 33 insertions(+), 3 deletions(-)
---