From: Stéphane Jacob <sj@m4x.org>
Date: Sun, 4 Jul 2010 17:10:45 +0000 (+0200)
Subject: Merge remote branch 'origin/platal-1.0.0'
X-Git-Tag: xorg/1.0.1~360
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=0c54d458de4782d691b9bcdeac872982c1027231;p=platal.git

Merge remote branch 'origin/platal-1.0.0'
---

0c54d458de4782d691b9bcdeac872982c1027231