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

[Mark Chappell]

commit 1936a42932daa0a6d3d5e69518b7deb3ce3291fd
Merge: 168dd7b 6bc01a4
Author: Mark Chappell <tremble at tremble.org.uk>
Date:   Fri Sep 10 15:58:04 2010 +0200

    Merge branch 'master' into f13

 .gitignore |    1 +
 putty.spec |   16 ++++++++++------
 sources    |    2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)
---