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

[Robert Scheck]

commit f495bcd31e290c8677f8b7ddbff914a02a6b765d
Merge: 956af20 71124f4
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Oct 31 21:11:45 2010 +0100

    Merge remote branch 'origin/master' into el6

 .gitignore |    2 +-
 sources    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---