Merge commit 'origin/master'
authorroot <root@blitz.inria.fr>
Wed, 17 Nov 2010 21:52:56 +0000 (22:52 +0100)
committerroot <root@blitz.inria.fr>
Wed, 17 Nov 2010 21:52:56 +0000 (22:52 +0100)
commitff5ac33c4014af79693a9e4ae4d2ea37bc475f19
tree8fbdb11c583e4eec9e96167a25d8f4f46d265803
parent53c87406a99b2f65bcfe00a050185139e97a0963
parent2bf8facc38995af6c2b5dbe2b064ea6be0247d9b
Merge commit 'origin/master'