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

[Robert Scheck]

commit 70a73f028aada1a15306e655b596dfe4672f4d4e
Merge: 8fb182e 71124f4
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Oct 31 21:12:17 2010 +0100

    Merge remote branch 'origin/master' into el5

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