From: David Given <dg@cowlark.com>
Date: Fri, 17 May 2013 14:28:04 +0000 (+0100)
Subject: Merge fixes from trunk.
X-Git-Tag: release-6-0-pre-5~10^2~76
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=5b4aa07dee9cac19dce42d25a137a038f2509713;p=ack.git

Merge fixes from trunk.

--HG--
branch : dtrg-videocore
---

5b4aa07dee9cac19dce42d25a137a038f2509713