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

[Robert Scheck]

commit b3ca476900f3d8b1a45b3ee234a066dce4152e9e
Merge: fbac510 b1fea4b
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sat Aug 13 14:16:57 2011 +0200

    Merge remote branch 'origin/master' into el5

 .gitignore                   |    2 +-
 drbdlinks-1.19-selinux.patch |   24 ------------------------
 drbdlinks.spec               |    9 +++++----
 sources                      |    2 +-
 4 files changed, 7 insertions(+), 30 deletions(-)
---