Automated merge with http://dev.pocoo.org/hg/jinja2-main
authorBenjamin Wiegand <highwaychile@bluevaria.de>
Mon, 9 Jun 2008 17:09:39 +0000 (19:09 +0200)
committerBenjamin Wiegand <highwaychile@bluevaria.de>
Mon, 9 Jun 2008 17:09:39 +0000 (19:09 +0200)
--HG--
branch : trunk


Trivial merge