Merge commit 'sjoerd/master'
authorXavier Claessens <xclaesse@src.gnome.org>
Fri, 15 Feb 2008 22:28:44 +0000 (22:28 +0000)
committerXavier Claessens <xclaesse@src.gnome.org>
Fri, 15 Feb 2008 22:28:44 +0000 (22:28 +0000)
commitb68b95efe92023193c318d4dd0fb92544463adef
treea8299869c5f9203d294ebe2d0c7baaf4c1f96a91
parentaec4141672783925d11bff56f9cd5019ef62c3c5
Merge commit 'sjoerd/master'

svn path=/trunk/; revision=637
libempathy/empathy-contact.c
libempathy/empathy-contact.h
libempathy/empathy-tp-call.c
libempathy/empathy-tp-contact-factory.c