[clusterssh/el6/master: 7/7] Merge branch 'master' into el6

[Filipe Rosset]

commit d9d4457637e36cf891cbc06428f3ab79c2832fd7
Merge: 5337214 615c043
Author: Filipe Rosset <rosset.filipe at gmail.com>
Date:   Wed Aug 18 01:07:30 2010 -0300

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore             |    1 +
 clusterssh-3.28.tar.gz |  Bin 0 -> 103780 bytes
 clusterssh.spec        |   11 +++++++----
 sources                |    2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)
---