Merge remote branch 'origin/master'
authorBarış Metin <Talip-Baris.Metin@sophia.inria.fr>
Wed, 7 Jul 2010 17:00:41 +0000 (19:00 +0200)
committerBarış Metin <Talip-Baris.Metin@sophia.inria.fr>
Wed, 7 Jul 2010 17:00:41 +0000 (19:00 +0200)

Trivial merge