Merge commit 'local_master/master'
authorroot <root@blitz.inria.fr>
Tue, 18 Jan 2011 21:51:16 +0000 (22:51 +0100)
committerroot <root@blitz.inria.fr>
Tue, 18 Jan 2011 21:51:16 +0000 (22:51 +0100)
commitd78ee34f11069e60817b3833cf683c4502f722bd
tree45080e7449d754b115d467ca362f8ce97fb63b8b
parent30de233324832dcf3555b9113934f241b9c0b36c
parent3fa9f13f777fda5c1bdfa66e5bbe9b864ad92ef8
Merge commit 'local_master/master'