[drbdlinks/f13: 4/4] Merge remote branch 'origin/master' into f13

[Robert Scheck]

commit bf9766f1dd864991767badc2b05dd1a190110d2d
Merge: 086fa92 cbc2f6c
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon May 16 23:11:56 2011 +0200

    Merge remote branch 'origin/master' into f13
    
    Conflicts:
    	.gitignore

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