[putty/f13/master: 3/3] Merge branch 'master' into f13

[Mark Chappell]

commit 168dd7b2af17cd6f32483d45268dd31a2106a55b
Merge: be0f2f0 b4f56db
Author: Mark Chappell <tremble at tremble.org.uk>
Date:   Fri Sep 10 15:16:50 2010 +0200

    Merge branch 'master' into f13

 .gitignore        |    1 +
 putty-perms.patch |   10 +++++-----
 putty.desktop     |    6 +++---
 putty.spec        |   52 ++++++++++++++++++++++++++++------------------------
 sources           |    3 +--
 5 files changed, 38 insertions(+), 34 deletions(-)
---