Merge commit 'origin/master'
authorroot <root@blitz.inria.fr>
Wed, 23 Mar 2011 18:30:59 +0000 (19:30 +0100)
committerroot <root@blitz.inria.fr>
Wed, 23 Mar 2011 18:30:59 +0000 (19:30 +0100)
commita0204f0501a02f6a25c07093fb0f16fefbdccdd2
tree20d7f4a0a169cb40803c244c28cbab77d5870613
parent77714215faff48f21434141eed4be428491532c8
parent43f202b7cc12255c1a5afbe8ac810ffbf97396f5
Merge commit 'origin/master'