Updating git repository
Updating django to 1.4.10
Merge remote-tracking branch 'origin/update_badger'

Conflicts:
	buildout.cfg