Merge commit 'local_master/master'
authorroot <root@blitz.inria.fr>
Wed, 8 Dec 2010 15:40:26 +0000 (16:40 +0100)
committerroot <root@blitz.inria.fr>
Wed, 8 Dec 2010 15:40:26 +0000 (16:40 +0100)
commit33938bba0a1f90034390af839dfa4661c190acdc
treeed423ff4881286cc8b048101aff42ee92c0da14c
parente2b245e4ab27492990baf4743bae4b8fca0c7a71
parent8bd70e8b8aa55b2877e381928594f7954d681408
Merge commit 'local_master/master'