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

Trivial merge