Automated merge with ssh://dev.pocoo.org/jinja2-main

--HG--
branch : trunk