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

[Silas Sewell]

commit 302611ebf649ce2d5e5d994746fa0c3eff479ac1
Merge: df1e279 aea889c
Author: Silas Sewell <silas at sewell.org>
Date:   Thu May 17 20:45:57 2012 -0400

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

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