Merge commit 'origin/master'
authorroot <root@blitz.inria.fr>
Wed, 17 Nov 2010 20:58:52 +0000 (21:58 +0100)
committerroot <root@blitz.inria.fr>
Wed, 17 Nov 2010 20:58:52 +0000 (21:58 +0100)
commit5c996d4aac44f97bd24c64770fed4e6df854e7c9
treefc22afcdf8663cbf15843b306958865e49e5c342
parentd065e00d4caba638d145d11b37fa466e51cbc21b
parentc7076bbd31eb7bdc28d6259998a4dbeb798a0d8f
Merge commit 'origin/master'