[rear/el6: 9/10] Merge branch 'master' of ssh://pkgs.fedoraproject.org/rear

[Gratien Dhaese]

commit 1a965b4ace0cd993b192b82e54a3335f99c96841
Merge: 3173552 319cc03
Author: gdha <gratien.dhaese at gmailcom>
Date:   Tue Nov 22 13:00:19 2011 +0100

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/rear
    
    Conflicts:
    	rear.spec

---