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

[Robert Scheck]

commit a414db2c5962ee2ff82de6bed5fd6a2933ea2325
Merge: bd7b2fa cbc2f6c
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon May 16 23:18:24 2011 +0200

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

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