fa1d9f97df
Fix the massive, extreme breakage introduced by shuffling around a few addressbook-related files without updating the Makefiles. I hope at least it builds now. *Sigh.* svn path=/trunk/; revision=5473