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