Merged devel-addressbook back to trunk