[clustershell/el5: 3/3] Merge branch 'master' into el5

[Stephane Thiell]

commit 254922cd6423a2116fb5ffef9fb0c71f9492f3cf
Merge: ee65cd1 097caa2
Author: Stephane Thiell <stephane.thiell at cea.fr>
Date:   Sun Apr 8 18:13:26 2012 +0200

    Merge branch 'master' into el5

 .gitignore        |    1 +
 clustershell.spec |   21 +++++++++++++++++----
 sources           |    2 +-
 3 files changed, 19 insertions(+), 5 deletions(-)
---