Merge branch 'cleanup' into io
commitcf334f1a32a872c2a01ff243c2e914d6cbf8eea9
authorFrancis Galiegue <fgaliegue@gmail.com>
Fri, 9 May 2008 15:39:22 +0000 (9 17:39 +0200)
committerFrancis Galiegue <fgaliegue@gmail.com>
Fri, 9 May 2008 15:39:22 +0000 (9 17:39 +0200)
treee235d2cc26ef745b3dc3deba7d7a0e23bb4fc187
parent8504f6d572b386cce57b9730d74bcd19b1105a05
parent4b4e97dd6ac483e1ef11ebdcf92d3f034fb6875b
Merge branch 'cleanup' into io