[drbdlinks/el5: 9/9] Merge remote branch 'origin/master' into el5

[Robert Scheck]

commit eb7a4bdb9d16bdd7698728755f53fde8f7b3fb96
Merge: fb8dc42 cbc2f6c
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon May 16 23:16:51 2011 +0200

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

 .gitignore     |    2 +-
 drbdlinks.spec |   15 ++++++++++++---
 sources        |    2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)
---