[python-pp/f12/master: 5/5] Merge branch 'master' into f12

[smilner]

commit da39f0a12465a631126b6232c8d691fe34147e46
Merge: 7cdff6f fef6700
Author: Steve 'Ashcrow' Milner <stevem at gnulinux.net>
Date:   Thu Aug 12 22:19:37 2010 -0400

    Merge branch 'master' into f12
    
    Conflicts:
    	.gitignore

 python-pp.spec |   10 ++++++++--
 sources        |    2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)
---