Merge commit 'origin/master' into fusionax
authorVincent Zanotti <vincent.zanotti@polytechnique.org>
Sun, 19 Oct 2008 03:15:42 +0000 (05:15 +0200)
committerVincent Zanotti <vincent.zanotti@polytechnique.org>
Sun, 19 Oct 2008 03:15:42 +0000 (05:15 +0200)
commit1760b3f7f98eabdd4506211ce17be472734e6192
tree7f8f133b75eaf54cc4adc17f39ca6ce8a89740af
parentacc9be56f2cc773f7e684f9cd3201141bc126ee2
parentea74d2785d9c1ff5571ebf2f73c89cbf19c8dd07
Merge commit 'origin/master' into fusionax