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)
commit5b4aa07dee9cac19dce42d25a137a038f2509713
tree9f9e441a6f19cb041fdc3a5ccbc34ec5d91bfa1d
parent32ebc502c86047797d72122a98e329f2ca03a05e
parent9a513e8ef3d390b7fd41a2c7299dad2e6bb4bcb8
Merge fixes from trunk.

--HG--
branch : dtrg-videocore