[clusterssh/el5/master: 12/12] Merge branch 'master' into el5

[Filipe Rosset]

commit 4a3e816eb376e1dd1189d7dc1b7712ef70e2f06f
Merge: e4dd6c2 615c043
Author: Filipe Rosset <rosset.filipe at gmail.com>
Date:   Wed Aug 18 01:05:48 2010 -0300

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	clusterssh.spec
    	sources

 .gitignore             |    1 +
 clusterssh-3.28.tar.gz |  Bin 0 -> 103780 bytes
 clusterssh.spec        |   11 +++++++----
 sources                |    1 +
 4 files changed, 9 insertions(+), 4 deletions(-)
---
diff --cc sources
index df35945,adcb0b6..23e938b
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,2 @@@
 +295222fce033f955fb07b6df8e8dbaea  clusterssh-3.26.tar.gz
+ 11e012329d2c62e1f7b17f3ac517769a  clusterssh-3.28.tar.gz