From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Fri, 15 Aug 2008 12:54:59 +0000 (+0200)
Subject: Merge commit 'origin/master' into fusionax
X-Git-Tag: xorg/1.0.0~332^2~537
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=dc4cca93c80e52642c8134a570fecee217221d8a;p=platal.git

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

dc4cca93c80e52642c8134a570fecee217221d8a