Merge branch 'gingerbread' of...

Merge branch 'gingerbread' of git://android.git.kernel.org/platform/packages/apps/Contacts into HEAD

Conflicts:
	res/values-de/strings.xml
	res/values-zh-rTW/strings.xml

Change-Id: Ibe95d2ceb10d31700747ec78d9333ab68a84954e