Merge branch 'mallard-templates'
authorTomeu Vizoso <tomeu.vizoso@collabora.com>
Mon, 20 Feb 2012 17:18:04 +0000 (18:18 +0100)
committerTomeu Vizoso <tomeu.vizoso@collabora.com>
Mon, 20 Feb 2012 17:18:04 +0000 (18:18 +0100)

Trivial merge