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

[Robert Scheck]

commit 47021b174f0a2ffcc7aca737e411eff28d5e7337
Merge: 5bbc806 71124f4
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Oct 31 21:10:32 2010 +0100

    Merge remote branch 'origin/master' into f13

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