Updating static location for Apache template (Django 1.3)
Merge remote-tracking branch 'origin/django1.3'

* origin/django1.3:
  Updating static location for Apache template (Django 1.3)

Conflicts:
	fabmanager/fabfile.py
Fix to previous merge