Merge commit 'kha/safe'
authorCatalin Marinas <catalin.marinas@arm.com>
Tue, 8 Sep 2009 20:41:19 +0000 (21:41 +0100)
committerCatalin Marinas <catalin.marinas@arm.com>
Tue, 8 Sep 2009 20:41:19 +0000 (21:41 +0100)

Trivial merge