Trunk: Merge of r7485, a pygment fix, for thatch
Authored by: ecarter 2008-08-21
Parent: [r7487]
Child: [r7489]