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

[Stephane Thiell]

commit a7db39da0a55fc597c76c62c441b552ec9e7d11b
Merge: 760f7c3 707c60b
Author: Stephane Thiell <stephane.thiell at cea.fr>
Date:   Tue Mar 15 23:34:15 2011 +0100

    Merge branch 'master' into f14

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