[winpdb/el6: 6/6] Merge branch 'master' into el6

[Matej Cepl]

commit 96bde6b7d91ea63edd1a21c8bd4575c1b8261812
Merge: baa405c 153ef2b
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Fri Nov 11 23:26:46 2011 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 sources     |    2 +-
 winpdb.spec |   13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)
---