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

[Robert Scheck]

commit 819e026b8aa745d47d76b69f0988da132144d19d
Merge: 5274beb a1ddc27
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Thu Dec 9 00:12:19 2010 +0100

    Merge remote branch 'origin/master' into f14

 .gitignore                      |    2 +-
 duplicity-0.6.10-python23.patch |   24 ------------------------
 duplicity.spec                  |    7 ++++---
 sources                         |    2 +-
 4 files changed, 6 insertions(+), 29 deletions(-)
---