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

[Stephane Thiell]

commit a8af29eeda1dd2f7683defaf1deabad95d9c2061
Merge: d1935fe 7878915
Author: Stephane Thiell <stephane.thiell at cea.fr>
Date:   Sat Mar 19 21:44:35 2011 +0100

    Merge branch 'master' into f13

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