first commit with egit
Merge branch 'dev_thinkpad'

Conflicts:
	mysite/settings.pyc