Merge pull request #68 from jcastillo-arm/jc/tf-issues/137
authorAndrew Thoelke <andrew.thoelke@arm.com>
Fri, 16 May 2014 11:02:12 +0000 (12:02 +0100)
committerAndrew Thoelke <andrew.thoelke@arm.com>
Fri, 16 May 2014 11:25:21 +0000 (12:25 +0100)
Change-Id: If8744c38c2d5c50caa7454b055e2ba418cf1e8bf


Trivial merge