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

[Robert Scheck]

commit 4545e866f9d849bed9d28655dfeb9051dab5b66e
Merge: bf47ba9 b1fea4b
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sat Aug 13 14:17:21 2011 +0200

    Merge remote branch 'origin/master' into el4

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