 addressbook/libebook-contacts/e-book-query.c              |  252 ++++-------
 addressbook/libebook-contacts/e-book-query.h              |    6 
 addressbook/libedata-book/e-book-backend-sexp.c           |  197 +++++---
 calendar/libedata-cal/e-cal-backend-sexp.c                |    1 
 configure.ac                                              |   24 -
 docs/reference/libedataserver/libedataserver-docs.sgml    |    1 
 docs/reference/libedataserver/libedataserver-sections.txt |   18 
 libedataserver/Makefile.am                                |    7 
 libedataserver/e-phone-utils.cpp                          |  313 ++++++++++++++
 libedataserver/e-phone-utils.h                            |  224 ++++++++++
 libedataserver/e-sexp.c                                   |    4 
 libedataserver/libedataserver.h                           |    1 
 m4/evo_check_langinfo.m4                                  |   25 +
 m4/evo_phonenumber.m4                                     |   68 +++
 tests/libebook/client/Makefile.am                         |   11 
 tests/libebook/client/client-test-utils.c                 |   10 
 tests/libebook/data/vcards/custom-1.vcf                   |    2 
 tests/libebook/test-query.c                               |  159 ++++++-
 tests/libedataserver/Makefile.am                          |   15 
 tests/libedataserver/e-phone-utils-test.c                 |  250 +++++++++++
 tests/libedataserver/e-test-dbus-utils.c                  |  184 ++++++++
 tests/libedataserver/e-test-dbus-utils.h                  |   33 +
 22 files changed, 1548 insertions(+), 257 deletions(-)
