Merge commit 'origin/master'
authorroot <root@blitz.inria.fr>
Tue, 5 Apr 2011 15:12:14 +0000 (17:12 +0200)
committerroot <root@blitz.inria.fr>
Tue, 5 Apr 2011 15:12:14 +0000 (17:12 +0200)
commit61812161f69f838e02b23543feb354f7233c0259
treebfe38aaa7864b2c9709a5e3d5e494541a75ce661
parent41c04b2453c315b8046283e7a0e18b712812c732
parent12c6bd36946d7f8be802a6e0018af5494f8bd277
Merge commit 'origin/master'