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

[terjeros]

commit fa24b5bdee98e19d3bb20c1aa0c708c82ab333cb
Merge: 801bce2 15709d7
Author: Terje Røsten <terje.rosten at ntnu.no>
Date:   Sat Jan 22 22:29:51 2011 +0100

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	pssh.spec
    	sources

 .gitignore |    1 +
 pssh.spec  |   14 ++++++++++++--
 sources    |    2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)
---