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)
commit023b3a8d45741d1569519b9be8eb65ea716c857c
treea64a1b6f8dee9cd3f0057e525d40e1e408fd01b1
parent3e022c8a41837e0894d017c4912b77e4b1792744
parent652b2e670f7666e4055fbcd5c2dd9e4275efee2a
Merge commit 'kha/safe'