Merge commit 'origin/master'
authorroot <root@blitz.inria.fr>
Fri, 1 Apr 2011 20:58:20 +0000 (22:58 +0200)
committerroot <root@blitz.inria.fr>
Fri, 1 Apr 2011 20:58:20 +0000 (22:58 +0200)
commitcdc2396b04e5de401e75a57b27ed963a2f2663a4
tree73fa18fe33cf7fb0cf5722693673d449b99acb74
parent587e5a30120fef8a5065d5bdf8655c5042fb48f3
parent7ef1a21b48fdb7d859db28999c18022916781f49
Merge commit 'origin/master'