Merge remote branch 'origin/master'
authorBarış Metin <Talip-Baris.Metin@sophia.inria.fr>
Sat, 31 Jul 2010 10:56:34 +0000 (12:56 +0200)
committerBarış Metin <Talip-Baris.Metin@sophia.inria.fr>
Sat, 31 Jul 2010 10:56:34 +0000 (12:56 +0200)

Trivial merge