Merge branch 'misc'
authorDanielle Madeley <danielle.madeley@collabora.co.uk>
Wed, 16 May 2012 10:51:19 +0000 (20:51 +1000)
committerDanielle Madeley <danielle.madeley@collabora.co.uk>
Wed, 16 May 2012 10:51:19 +0000 (20:51 +1000)

Trivial merge