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

[Robert Scheck]

commit 90c0316fac21ab9ca577d8a5d461cb3b5a526f1d
Merge: c99f34b 63e83da
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Thu Jul 19 01:34:52 2012 +0200

    Merge remote branch 'origin/master' into el6

 .gitignore         |    2 +-
 drbdlinks.spec     |   41 +++++++++++++++++++----------------------
 drbdlinks.tmpfiles |    2 --
 drbdlinksclean     |    6 ++++--
 sources            |    2 +-
 5 files changed, 25 insertions(+), 28 deletions(-)
---