From: Stéphane Jacob <sj@m4x.org>
Date: Sat, 17 Jul 2010 17:01:00 +0000 (+0200)
Subject: Merge remote branch 'origin/platal-1.0.0'
X-Git-Tag: xorg/1.0.1~324
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=3c696b26901e971c2a0f20dbdee3e7af49a576b6;p=platal.git

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

3c696b26901e971c2a0f20dbdee3e7af49a576b6