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

Trivial merge