merge from banane
authorPaul Brossier <piem@piem.org>
Sat, 3 Nov 2007 18:12:13 +0000 (19:12 +0100)
committerPaul Brossier <piem@piem.org>
Sat, 3 Nov 2007 18:12:13 +0000 (19:12 +0100)
commitd4a6eb9c49e9a5f755a4c4d46570b0e970adbd34
treeb2932fc0c175a98171354d2718ec5cf3aa68e4f5
parentc721874779073106425b8c883f3c27879665d108
parent2b3280abacda5f37518ee1579428fa9a4a908c68
merge from banane