[python-ssh/el6: 4/4] Merge branch 'master' into el6

[Silas Sewell]

commit 799b9be305f5e841136e2dd290ad4b629441edc0
Merge: 344d7c4 aea889c
Author: Silas Sewell <silas at sewell.org>
Date:   Thu May 17 21:04:02 2012 -0400

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	python-ssh.spec
    	sources

 .gitignore      |    1 +
 python-ssh.spec |   11 +++++++----
 sources         |    1 +
 3 files changed, 9 insertions(+), 4 deletions(-)
---