after my disasterous merge, before, apply lauritzen's changes to master, but do not import the compiler at the top level since that isn't compatible with django 1.1
after my disasterous merge, before, apply lauritzen's changes to master, but do not import the compiler at the top level since that isn't compatible with django 1.1

BertrandBordage/johnny-cache,DjangoAdminHackers/johnny-cache,jmoiron/johnny-cache,DjangoAdminHackers/johnny-cache