Merge commit 'origin/master'
authorroot <root@blitz.inria.fr>
Sat, 26 Mar 2011 13:55:30 +0000 (14:55 +0100)
committerroot <root@blitz.inria.fr>
Sat, 26 Mar 2011 13:55:30 +0000 (14:55 +0100)
commitcccd9d9a58421493631320ee2251e8de3d3f2109
treed7ea288f35e639a6d73b7af21664298d136ee0c3
parentcfeb502877d73623a039217f77627f3eb91f273c
parent3bc12a155eb7a4353cf3343a6a1720b21862d0fd
Merge commit 'origin/master'