Merge commit 'origin/master'
authorroot <root@blitz.inria.fr>
Fri, 25 Mar 2011 20:13:41 +0000 (21:13 +0100)
committerroot <root@blitz.inria.fr>
Fri, 25 Mar 2011 20:13:41 +0000 (21:13 +0100)
commitcfeb502877d73623a039217f77627f3eb91f273c
tree4beaff547ec14cd32dfe20f067f038c94d6febc9
parenta77dff258df81137d430ea0e7d67c9cdfb3ea67c
parente75f7bb0dc5d79284308fecc997beebf91594598
Merge commit 'origin/master'