Merge remote branch 'origin/master'
authorBarış Metin <Talip-Baris.Metin@sophia.inria.fr>
Mon, 19 Jul 2010 08:50:55 +0000 (10:50 +0200)
committerBarış Metin <Talip-Baris.Metin@sophia.inria.fr>
Mon, 19 Jul 2010 08:50:55 +0000 (10:50 +0200)

Trivial merge