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

[Toshio くらとみ]

commit 761a8b0a8b3abd30269cc118fc0c9f7777b000ee
Merge: e5b5371 63ac05e
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Mon Sep 12 17:43:53 2011 -0700

    Merge branch 'master' into el5

 python-pygments.spec |   30 +++++++++++++++++++++++-------
 1 files changed, 23 insertions(+), 7 deletions(-)
---