ported fix for #368 from maintenance branch.
authorArmin Ronacher <armin.ronacher@active-4.com>
Thu, 11 Feb 2010 13:29:47 +0000 (14:29 +0100)
committerArmin Ronacher <armin.ronacher@active-4.com>
Thu, 11 Feb 2010 13:29:47 +0000 (14:29 +0100)
--HG--
branch : trunk


Trivial merge