merge from Amaury's changes
authorPaul Brossier <piem@piem.org>
Sat, 8 Sep 2007 11:52:48 +0000 (13:52 +0200)
committerPaul Brossier <piem@piem.org>
Sat, 8 Sep 2007 11:52:48 +0000 (13:52 +0200)
commit21bd43cd56c206a650d48e79d966bd4c40dff3dd
tree6d059d5e011bd540508dc51a245f19683e6f8a88
parentcb0415db6f21cc0df0293b63e15f6a17b71457ef
parent870855670c7d903af86e10ca5e5051a30e000f90
merge from Amaury's changes