commit cae9c2b8bcb96252e465dd871f6ed5766a9c5633 Merge: 760f7c3 707c60b Author: Stephane Thiell <stephane.thiell at cea.fr> Date: Tue Mar 15 23:35:19 2011 +0100 Merge branch 'master' into el6 .gitignore | 1 + clustershell.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---