Enhancement #2 complete.

Remove wrong if-case.
Merge branch 'master' of git.cannycode.de:opensource/google-addressbook