Merged trunk.
authorThomi Richards <thomi.richards@canonical.com>
Mon, 25 Nov 2013 04:53:03 +0000 (17:53 +1300)
committerThomi Richards <thomi.richards@canonical.com>
Mon, 25 Nov 2013 04:53:03 +0000 (17:53 +1300)

Trivial merge