Automated merge with https://bitbucket.org/wkornewald/djangoappengine
Automated merge with https://bitbucket.org/wkornewald/djangoappengine

potatolondon/djangoappengine-1-4,dwdraju/djangoappengine,django-nonrel/djangoappengine,Implisit/djangoappengine,brstrat/djangoappengine,potatolondon/djangoappengine-1-4