Merge remote branch 'origin/master'
authorBarış Metin <Talip-Baris.Metin@sophia.inria.fr>
Mon, 12 Jul 2010 20:15:42 +0000 (22:15 +0200)
committerBarış Metin <Talip-Baris.Metin@sophia.inria.fr>
Mon, 12 Jul 2010 20:15:42 +0000 (22:15 +0200)

Trivial merge