Merge to:
telepathy-sofiasip
From:
/home/smcv/public_html/darcs/tp-sofiasip-smcv
Changes:
Simon McVittie <simon.mcvittie at collabora.co.uk>
Copy m4_define magic from telepathy-glib/gabble/etc. to generate stable release tarballs with the right name