merge from amaury's branch
authorPaul Brossier <piem@piem.org>
Sun, 16 Sep 2007 16:06:07 +0000 (18:06 +0200)
committerPaul Brossier <piem@piem.org>
Sun, 16 Sep 2007 16:06:07 +0000 (18:06 +0200)
commite5f6a0b40630f923f680f0e3ed0ecf06d48f0399
treed72ab73ffdcfd3a05832d140ac6c07996715feec
parent45134c5d80f69a506f3619ce88fbafc1b2a54434
parentbc4ba753e5c7e50f6149add3c46e47f54ba23f05
merge from amaury's branch