blegh

probably last commit on a branch about to be removed.
Merge remote-tracking branch 'origin/ubuntu-13.04' into ubuntu-13.04

Conflicts:
	sync-config.sh