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

[Stephane Thiell]

commit ee65cd1b0d72833b543f08caf6dc77923c2c4742
Merge: 37faddc 69d91b3
Author: Stephane Thiell <stephane.thiell at cea.fr>
Date:   Thu Jun 9 20:11:12 2011 +0200

    Merge branch 'master' into el5

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