[python-pygments/el5: 25/25] Merge branch 'master' into el5

[smilner]

commit e5b5371bcf09a7f09f07009ee00aeae43a10aa0f
Merge: a9c6aae e4d4c18
Author: Steve Milner <stevem at gnulinux.net>
Date:   Wed Jul 20 11:31:17 2011 -0400

    Merge branch 'master' into el5

 .gitignore           |    1 +
 python-pygments.spec |  198 +++++++++++++++++++++++++++++++++++++++++++++++---
 sources              |    2 +-
 3 files changed, 188 insertions(+), 13 deletions(-)
---