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

[Stephane Thiell]

commit 37faddc4c9b3e2eb25833496592079018e3ab9a1
Merge: 86181a8 cf77a31
Author: Stephane Thiell <stephane.thiell at cea.fr>
Date:   Thu Jun 9 00:34:52 2011 +0200

    Merge branch 'master' into el5

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