Merge commit 'local_master/1.3.5.1@6970' into trunk@12172 trunk@12172
authorroot <root@blitz.inria.fr>
Mon, 22 Nov 2010 05:13:37 +0000 (06:13 +0100)
committerroot <root@blitz.inria.fr>
Mon, 22 Nov 2010 05:13:37 +0000 (06:13 +0100)
commitea0ac95e02088de09de80f00e0ea129f7c950b03
tree81144fe81ac2bd06de6925d24a11cab041e7bd9e
parent470fccc41b5c57d5f3d31a1bfcf110a7f2c20eb7
parentcec3130fab73f806cb517e5b6f825fe2a4c709a2
Merge commit 'local_master/1.3.5.1@6970' into trunk@12172