From: Pascal Corpet <pascal.corpet@m4x.org>
Date: Fri, 11 Apr 2008 21:47:15 +0000 (+0200)
Subject: Merge branch 'master' of /home/git/platal into fusionax
X-Git-Tag: xorg/1.0.0~332^2~575
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=652d69e72d90b1c104a6f74061900ca634b898a7;p=platal.git

Merge branch 'master' of /home/git/platal into fusionax
---

652d69e72d90b1c104a6f74061900ca634b898a7