merged from mtg
authorAmaury Hazan <mahmoudax@gmail.com>
Fri, 7 Sep 2007 08:49:45 +0000 (10:49 +0200)
committerAmaury Hazan <mahmoudax@gmail.com>
Fri, 7 Sep 2007 08:49:45 +0000 (10:49 +0200)

Trivial merge