Merge commit 'kha/safe'
authorCatalin Marinas <catalin.marinas@arm.com>
Wed, 2 Sep 2009 08:48:38 +0000 (09:48 +0100)
committerCatalin Marinas <catalin.marinas@arm.com>
Wed, 2 Sep 2009 08:48:38 +0000 (09:48 +0100)

Trivial merge