Merge branch 'balance-errors'
authorDanielle Madeley <danielle.madeley@collabora.co.uk>
Fri, 21 Oct 2011 21:45:04 +0000 (08:45 +1100)
committerDanielle Madeley <danielle.madeley@collabora.co.uk>
Fri, 21 Oct 2011 21:45:04 +0000 (08:45 +1100)

Trivial merge