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

[Stephane Thiell]

commit f0df759ec97a45f55deb4f8ccefbf498b6c81838
Merge: 2a6ccea cf77a31
Author: Stephane Thiell <stephane.thiell at cea.fr>
Date:   Thu Jun 9 00:33:35 2011 +0200

    Merge branch 'master' into f14

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