Merge remote branch 'pwith/fixes'
authorTravis Reitter <travis.reitter@collabora.co.uk>
Tue, 22 Jun 2010 17:37:56 +0000 (10:37 -0700)
committerTravis Reitter <travis.reitter@collabora.co.uk>
Tue, 22 Jun 2010 17:37:56 +0000 (10:37 -0700)
1  2 
backends/telepathy/tp-lowlevel.c

Simple merge