Merge to:
telepathy-glib
From:
/home/smcv/public_html/darcs/tp-glib-smcv-trivia
Changes:
Simon McVittie <simon.mcvittie at collabora.co.uk>
Document that GNU make is required, and tell Automake to stop warning us about using its features