Merge commit 'bari/marshalList'
authorXavier Claessens <xclaesse@src.gnome.org>
Mon, 18 Feb 2008 10:00:05 +0000 (10:00 +0000)
committerXavier Claessens <xclaesse@src.gnome.org>
Mon, 18 Feb 2008 10:00:05 +0000 (10:00 +0000)
commit33207a87645bf45e9ead5d16dbd94715420882b3
treeb5790e89bb4794fb0624c054e07652268e74dfbd
parent3536ae5d77fbd36458956536134a39d3c59de5fc
Merge commit 'bari/marshalList'

svn path=/trunk/; revision=651
libempathy-gtk/Makefile.am
libempathy/Makefile.am