[keepalived/el6: 12/12] Merge branch 'master' into el6

[Matthias Saou]

commit f7ff7c7604a2bc5e5a3f7c124581f589b00d5033
Merge: ba9e531 921ff3c
Author: Matthias Saou <thias at marmotte.net>
Date:   Wed Jul 13 11:19:12 2011 +0200

    Merge branch 'master' into el6

 .gitignore      |    2 +-
 keepalived.spec |   29 ++++++++++++++++++++++++++---
 sources         |    2 +-
 3 files changed, 28 insertions(+), 5 deletions(-)
---