Merge branch 'working-copy' into working-copy2

Conflicts:
	ofono/Makefile.am