Merge pull request #103 from athoelke:dh/tf-issues#68-v3
authorAndrew Thoelke <andrew.thoelke@arm.com>
Fri, 23 May 2014 10:00:04 +0000 (11:00 +0100)
committerAndrew Thoelke <andrew.thoelke@arm.com>
Fri, 23 May 2014 10:00:04 +0000 (11:00 +0100)

Trivial merge