Git + Eclipse = Desaster
Merge branch 'master' of https://github.com/dirkriehle/appengine-guestbook