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)
commit06e17aa6f11f598a7cb802d5516e56708996c870
treea5951d78a12f60ac81c9eb3801d1b93c19cd370a
parentcef5deb44e9b2ac2f9f63c4abc2d1bb20e1cb1d1
parent533d85c2f663a7e89816b23c627a118866ab00fb
Merge commit 'kha/safe'