Automated merge with https://www.knowledgetap.com/hg/pylons-dev
Automated merge with https://www.knowledgetap.com/hg/pylons-dev

--HG--
branch : trunk

moreati/pylons,moreati/pylons,Pylons/pylons,Pylons/pylons,moreati/pylons,Pylons/pylons