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

--HG--
branch : trunk