[crm114: 19/20] Merge remote branch 'origin/el6/master'

[Dominik Mierzejewski]

commit e7f0e9e13efa583c596fedfe3679065e74e93f41
Merge: d079fd2 9a3b094
Author: Dominik Mierzejewski <dominik at greysector.net>
Date:   Sun Nov 21 18:20:26 2010 +0100

    Merge remote branch 'origin/el6/master'
    
    Conflicts:
    	crm114-rpm.patch
    	crm114.spec

---