Merge commit 'origin/master'
authorroot <root@blitz.inria.fr>
Wed, 17 Nov 2010 21:22:55 +0000 (22:22 +0100)
committerroot <root@blitz.inria.fr>
Wed, 17 Nov 2010 21:22:55 +0000 (22:22 +0100)
commit32e6b3ac389e522e05b89833e9bd13ad853b6885
tree46ee4c2b7ac3d13fbcb1538c874dbf02d6bcfb93
parent5c996d4aac44f97bd24c64770fed4e6df854e7c9
parent6316c45df2f2a545d003d6ec51bba05e4b0f6bad
Merge commit 'origin/master'