Merge commit 'kha/safe'
authorCatalin Marinas <catalin.marinas@gmail.com>
Thu, 3 Dec 2009 22:37:04 +0000 (22:37 +0000)
committerCatalin Marinas <catalin.marinas@gmail.com>
Thu, 3 Dec 2009 22:37:04 +0000 (22:37 +0000)

Trivial merge