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

[Robert Scheck]

commit d7baba033809e1d468f862c359bf12f18b325f17
Merge: 6f092ed 57f2fa1
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Oct 31 21:05:50 2010 +0100

    Merge remote branch 'origin/master' into f12

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