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)
commitcffec5d25101b8bb1e524ab58989c6bb2c3cf391
treedecb4c4c915e9c3edf45ab7a6b86fd4b01864f1d
parentba1b0e7b744be8cd82081e4b2f4a0e1061939389
parent9ceb279125199c05725be0b3681f5fd4538ee315
Merge branch 'origin'