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

[Stephane Thiell]

commit 4b5ba5fb8e98a89bdfa133ce547266f7e88de542
Merge: a8af29e cf77a31
Author: Stephane Thiell <stephane.thiell at cea.fr>
Date:   Thu Jun 9 00:33:58 2011 +0200

    Merge branch 'master' into f13

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