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

[Stephane Thiell]

commit 6aaa8add6639f55d89128c08c0dfcc234680f00e
Merge: 2d40f63 69d91b3
Author: Stephane Thiell <stephane.thiell at cea.fr>
Date:   Thu Jun 9 20:10:51 2011 +0200

    Merge branch 'master' into el6

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