Merge remote branch 'pwith/fixes2'
authorTravis Reitter <travis.reitter@collabora.co.uk>
Thu, 24 Jun 2010 16:32:38 +0000 (09:32 -0700)
committerTravis Reitter <travis.reitter@collabora.co.uk>
Thu, 24 Jun 2010 16:32:38 +0000 (09:32 -0700)
commit0db23bffa5edd3ca0aa467471bb51e69b50c68aa
treeaca066d61587cc18ea5ec18b64cb21caa6b36340
parent5adecc4f4b2c022750f5a7fb001363b95260ae41
parent051b022016b9e596a66a6f3c2d0906364124596b
Merge remote branch 'pwith/fixes2'

(Fixed)
Conflicts:
backends/telepathy/tpf-persona-store.vala
backends/telepathy/tpf-persona-store.vala