some changes
authorAmaury Hazan <mahmoudax@gmail.com>
Mon, 10 Sep 2007 19:27:16 +0000 (21:27 +0200)
committerAmaury Hazan <mahmoudax@gmail.com>
Mon, 10 Sep 2007 19:27:16 +0000 (21:27 +0200)

Trivial merge