Merge commit 'ka/empathy-tpl-20100225-ifdef'

author Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

Fri, 26 Feb 2010 08:49:16 +0000 (08:49 +0000)

committer Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

Fri, 26 Feb 2010 08:49:16 +0000 (08:49 +0000)
author Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Fri, 26 Feb 2010 08:49:16 +0000 (08:49 +0000)
committer Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Fri, 26 Feb 2010 08:49:16 +0000 (08:49 +0000)
diff --cc configure.ac
Simple merge
diff --cc src/empathy.c
Simple merge
author	Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
	Fri, 26 Feb 2010 08:49:16 +0000 (08:49 +0000)
committer	Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
	Fri, 26 Feb 2010 08:49:16 +0000 (08:49 +0000)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/empathy.c	patch \|	diff1 \|	diff2 \|	blob \| history