Merge commit 'origin/master' into hruid
authorVincent Zanotti <vincent.zanotti@polytechnique.org>
Sat, 19 Jul 2008 13:26:50 +0000 (15:26 +0200)
committerVincent Zanotti <vincent.zanotti@polytechnique.org>
Sat, 19 Jul 2008 13:26:50 +0000 (15:26 +0200)
commitd75f57dac58ca37ea8cd1b7849b0b879ad65c76f
tree8364ecd2cbbda7e108ec1cb5f02d827887a88d06
parentbd4f648ba40d48ad6bf8b60d5707f2a9324c450c
parent52e5a81679cde60a6609e893352b6dface9e1e08
Merge commit 'origin/master' into hruid