:-/ next time: first pull upstream, then update locally, then push. sorry for confusion!

Merge branch 'eclair' of http://github.com/cyanogen/android_packages_apps_Settings into eclair

Conflicts:
	res/values-de/arrays.xml
	res/values-de/strings.xml