Merge commit 'kha/safe'
authorCatalin Marinas <catalin.marinas@gmail.com>
Fri, 17 Jul 2009 13:05:23 +0000 (14:05 +0100)
committerCatalin Marinas <catalin.marinas@gmail.com>
Fri, 17 Jul 2009 13:05:23 +0000 (14:05 +0100)

Trivial merge