Merge fixes from trunk.
authorDavid Given <dg@cowlark.com>
Fri, 17 May 2013 14:28:04 +0000 (15:28 +0100)
committerDavid Given <dg@cowlark.com>
Fri, 17 May 2013 14:28:04 +0000 (15:28 +0100)
--HG--
branch : dtrg-videocore


Trivial merge