Merge commit 'origin/master'
authorroot <root@blitz.inria.fr>
Wed, 17 Nov 2010 21:43:54 +0000 (22:43 +0100)
committerroot <root@blitz.inria.fr>
Wed, 17 Nov 2010 21:43:54 +0000 (22:43 +0100)
commit53c87406a99b2f65bcfe00a050185139e97a0963
tree6e90af0a43eae645e7f388d97d66cd2f0227ccdf
parenta0b98745bd9a073d3ff9a91e33cbab0904dbfdf2
parent13d4b2ff0fd0a490af8d12abd4a1083f53b6a500
Merge commit 'origin/master'