Merge commit 'origin/hruid'
authorVincent Zanotti <vincent.zanotti@polytechnique.org>
Sat, 18 Oct 2008 14:56:46 +0000 (16:56 +0200)
committerVincent Zanotti <vincent.zanotti@polytechnique.org>
Sat, 18 Oct 2008 14:56:46 +0000 (16:56 +0200)
commita0c034efcf0777541e087500e94853f515cda1ca
treedda342c93970b40ce59fbff8405dca5691be6740
parentce9c2dadbe6a3b6a5241fc21d279062260fa6553
parente8ab633224e3c9291180a8ae7dec9e629b7f6268
Merge commit 'origin/hruid'