Merge branch 'eclair' of...

Merge branch 'eclair' of git://android.git.kernel.org/platform/packages/apps/DeskClock into eclair-backport

Conflicts:
	res/values/strings.xml
	src/com/android/deskclock/DeskClock.java