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

[Stephane Thiell]

commit 1a07948ceb356773704106dd4275436a3f91f529
Merge: 6aaa8ad 097caa2
Author: Stephane Thiell <stephane.thiell at cea.fr>
Date:   Sun Apr 8 18:08:37 2012 +0200

    Merge branch 'master' into el6

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