Merge remote branch 'origin/master'
authorBarış Metin <Talip-Baris.Metin@sophia.inria.fr>
Fri, 16 Jul 2010 07:05:45 +0000 (09:05 +0200)
committerBarış Metin <Talip-Baris.Metin@sophia.inria.fr>
Fri, 16 Jul 2010 07:05:45 +0000 (09:05 +0200)

Trivial merge