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

[Robert Scheck]

commit c8ab99d8cef426962e60a38b944887bd119a8d0f
Merge: f495bcd a1ddc27
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Thu Dec 9 00:13:19 2010 +0100

    Merge remote branch 'origin/master' into el6

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