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

[Robert Scheck]

commit 956af200a8298255937d43a9b194c8b5a3382d12
Merge: 5dbf47c 57f2fa1
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Oct 31 21:06:34 2010 +0100

    Merge remote branch 'origin/master' into el6

 duplicity-0.6.10-python23.patch |   24 ++++++++++++++++++++++++
 duplicity.spec                  |   11 ++++++++++-
 2 files changed, 34 insertions(+), 1 deletions(-)
---