merge from banane
authorPaul Brossier <piem@piem.org>
Tue, 6 Nov 2007 10:53:50 +0000 (11:53 +0100)
committerPaul Brossier <piem@piem.org>
Tue, 6 Nov 2007 10:53:50 +0000 (11:53 +0100)
commitef7df7698cf744f3d43859eb304e4ea4d69d4bfa
treeb25eccc093900bc91f52c6e01c84f3892fed8ed6
parent82c588a8e0993f866cbbfc3028289e99d5369f4a
parent2b3280abacda5f37518ee1579428fa9a4a908c68
merge from banane