[rsnapshot/el5: 11/11] Merge remote branch 'origin/master' into el5

[Robert Scheck]

commit 76aebd91344196673439bd190074ade21be7b22a
Merge: 58c0048 33f29db
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Wed Jul 25 20:59:25 2012 +0200

    Merge remote branch 'origin/master' into el5
    
    Conflicts:
    	.gitignore
    	rsnapshot.spec
    	sources

 .gitignore                       |    2 +-
 rsnapshot-fix-include-conf.patch |   14 +++++++
 rsnapshot.spec                   |   77 +++++++++++++++++---------------------
 sources                          |    2 +-
 4 files changed, 50 insertions(+), 45 deletions(-)
---