Automated merge with ssh://team@pocoo.org/pygments-main
Automated merge with ssh://team@pocoo.org/pygments-main

--HG--
branch : trunk

nex3/pygments,nex3/pygments,nex3/pygments,nex3/pygments,nex3/pygments,nex3/pygments,nex3/pygments,nex3/pygments,nex3/pygments,nex3/pygments,nex3/pygments