Merge branch 'master' into hruid
authorVincent Zanotti <vincent.zanotti@polytechnique.org>
Sun, 20 Jul 2008 16:23:55 +0000 (18:23 +0200)
committerVincent Zanotti <vincent.zanotti@polytechnique.org>
Sun, 20 Jul 2008 16:23:55 +0000 (18:23 +0200)
commitbb749d55509e1ea442cf67ad03975a2f4535aa90
tree069892157037c2576204da7757daa955426f806c
parenta164285921fafa77c35a5c00ebb68eea28575591
parenta5dc8113b9d715980333851bd74ae6a9a09f9047
Merge branch 'master' into hruid