[python-pp/f13/master: 4/4] Merge branch 'master' into f13

[smilner]

commit 3e07337df15b82b1507cca1548f0b7d5e198cbc9
Merge: f7c46ca fef6700
Author: Steve 'Ashcrow' Milner <stevem at gnulinux.net>
Date:   Thu Aug 12 22:13:28 2010 -0400

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore

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