Update for Djange 1.5.x