[evolution-data-server/meego-eds: 6/6] Merge remote-tracking branch 'remotes/origin/openismus-work' into meego-eds

[Christophe Dumez <cdumez src gnome org>]

commit 2e1487f48fd4467cdff5d12f5eb17cca76e9829a
Merge: 7dd30d5 7f0b835
Author: Christophe Dumez <christophe dumez intel com>
Date:   Thu Jun 16 21:50:35 2011 +0300

    Merge remote-tracking branch 'remotes/origin/openismus-work' into meego-eds

 addressbook/backends/file/e-book-backend-file.c    |   50 ++++-
 addressbook/libebook/e-book.c                      |   47 +++-
 addressbook/libedata-book/e-data-book-view.c       |   31 ++-
 addressbook/libedata-book/e-data-book-view.h       |   16 +-
 addressbook/libedata-book/e-data-book.c            |    9 +-
 addressbook/libedata-book/e-data-book.xml          |    2 +-
 addressbook/libegdbus/e-gdbus-egdbusbook.c         |   35 +++-
 addressbook/libegdbus/e-gdbus-egdbusbook.h         |    3 +
 addressbook/libegdbus/e-gdbus-marshallers.c        |   40 ++--
 addressbook/libegdbus/e-gdbus-marshallers.h        |   14 +-
 addressbook/libegdbus/e-gdbus-marshallers.list     |    2 +-
 addressbook/tests/ebook/Makefile.am                |    3 +
 addressbook/tests/ebook/ebook-test-utils.c         |    6 +-
 addressbook/tests/ebook/ebook-test-utils.h         |    2 +
 .../ebook/test-ebook-get-book-view-uid-only.c      |  259 ++++++++++++++++++++
 addressbook/tests/ebook/test-ebook-get-book-view.c |    4 +-
 16 files changed, 461 insertions(+), 62 deletions(-)
---