[putty/el6/master: 4/4] Merge branch 'master' into el6

[Mark Chappell]

commit cb0b030130ec2f890bd648ea9b7e9e949a483834
Merge: 623eacf b4f56db
Author: Mark Chappell <tremble at tremble.org.uk>
Date:   Fri Sep 10 15:11:30 2010 +0200

    Merge branch 'master' into el6

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