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

[Stephane Thiell]

commit 2a6ccea9a92cb441303bab27129cf498968cec40
Merge: a7db39d 7878915
Author: Stephane Thiell <stephane.thiell at cea.fr>
Date:   Sat Mar 19 21:43:54 2011 +0100

    Merge branch 'master' into f14

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