Merge remote-tracking branch 'gulic/buttons-668464'
authorDanielle Madeley <danielle.madeley@collabora.co.uk>
Tue, 13 Mar 2012 22:11:17 +0000 (09:11 +1100)
committerDanielle Madeley <danielle.madeley@collabora.co.uk>
Tue, 13 Mar 2012 22:11:17 +0000 (09:11 +1100)

Trivial merge