[python-pygments/f13/master: 9/9] Merge branch 'master' into f13

[smilner]

commit 662a15f3bef9038d6a5e436b151c64da5da059b6
Merge: a6f63aa 5a670f8
Author: Steve 'Ashcrow' Milner <stevem at gnulinux.net>
Date:   Sat Sep 11 16:09:17 2010 -0400

    Merge branch 'master' into f13

 python-pygments.spec |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)
---