[clusterssh/f13/master: 6/6] Merge branch 'master' into f13

[Filipe Rosset]

commit 2dbf8289934c7892edb5e026577f2abe90450efa
Merge: 6fb7349 615c043
Author: Filipe Rosset <rosset.filipe at gmail.com>
Date:   Wed Aug 18 00:52:51 2010 -0300

    Merge branch 'master' into f13
    
    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(-)
---