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

[Stephane Thiell]

commit 11ca7ef710d2e7c28602ff9dc3323804ee8c8cf3
Merge: f0df759 69d91b3
Author: Stephane Thiell <stephane.thiell at cea.fr>
Date:   Thu Jun 9 20:10:00 2011 +0200

    Merge branch 'master' into f14

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