From: Stéphane Jacob <jacou@melix.net>
Date: Thu, 30 Apr 2009 14:55:23 +0000 (+0200)
Subject: Merge commit 'origin/master' into fusionax
X-Git-Tag: xorg/1.0.0~332^2~313^2~9
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=b032b01b8919b36ec66f8a0395132953d8c01cf2;p=platal.git

Merge commit 'origin/master' into fusionax
---

b032b01b8919b36ec66f8a0395132953d8c01cf2