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

[Robert Scheck]

commit e934b8acb01457dbabeadf1384df497554a5fc17
Merge: b3ca476 63e83da
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Thu Jul 19 01:36:51 2012 +0200

    Merge remote branch 'origin/master' into el5

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