putting extends on top of template
Merge commit '23c1dd2d7ee47415714cd7654561522a459fb329' into django-1.5