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

[Mark Chappell]

commit a16a4fc5733df6e34cfde1459284a83f9675df22
Merge: cb0b030 6bc01a4
Author: Mark Chappell <tremble at tremble.org.uk>
Date:   Fri Sep 10 15:55:32 2010 +0200

    Merge branch 'master' into el6

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