Damn ugly looks of that dock launcher (Thanks to PA again for fixing it, didn't pick this earlier on)..

Conflicts:
	core/java/android/provider/Settings.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java