Automated merge with https://bitbucket.org/wkornewald/django-testapp
Automated merge with https://bitbucket.org/wkornewald/django-testapp

adieu/allbuttonspressed,adieu/allbuttonspressed,colinsullivan/google-app-engine-django-nonrel-boilerplate,adieu/upload-sample,colinsullivan/django-testapp