Merge remote branch 'origin/master'
authorBarış Metin <Talip-Baris.Metin@sophia.inria.fr>
Thu, 8 Jul 2010 14:20:11 +0000 (16:20 +0200)
committerBarış Metin <Talip-Baris.Metin@sophia.inria.fr>
Thu, 8 Jul 2010 14:20:11 +0000 (16:20 +0200)

Trivial merge