Merge commit 'kha/safe'
authorCatalin Marinas <catalin.marinas@gmail.com>
Tue, 3 Jun 2008 21:22:56 +0000 (22:22 +0100)
committerCatalin Marinas <catalin.marinas@gmail.com>
Tue, 3 Jun 2008 21:22:56 +0000 (22:22 +0100)

Trivial merge