Merge branch 'eclair' of http://github.com/takuo/android_packages_apps_Contacts into eclair