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

[terjeros]

commit bb5c0d7638f187d504ee9feffb5ee2e752d7431e
Merge: fa24b5b 6829adf
Author: Terje Røsten <terje.rosten at ntnu.no>
Date:   Thu Jan 27 12:37:53 2011 +0100

    Merge branch 'master' into f13

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