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

[Robert Scheck]

commit bf47ba997ef1628792dea32274a5b206984397ec
Merge: a414db2 1c3013d
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Jul 17 19:24:58 2011 +0200

    Merge remote branch 'origin/master' into el4

 drbdlinks-1.19-selinux.patch |   24 ++++++++++++++++++++++++
 drbdlinks.logrotate          |    2 ++
 drbdlinks.spec               |   23 ++++++++++++++++++++++-
 drbdlinks.tmpfiles           |    2 ++
 4 files changed, 50 insertions(+), 1 deletions(-)
---