Merge branch 'origin'
authorChristophe Varoqui <christophe.varoqui@free.fr>
Wed, 9 Jan 2008 00:28:20 +0000 (01:28 +0100)
committerChristophe Varoqui <christophe.varoqui@free.fr>
Wed, 9 Jan 2008 00:28:20 +0000 (01:28 +0100)

Trivial merge