From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sun, 21 Dec 2008 17:28:53 +0000 (+0100)
Subject: Merge commit 'origin/master' into fusionax
X-Git-Tag: xorg/1.0.0~332^2~344^2~61
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=a16cf1c2e56cc6e4c6cda1e984d2659c4cf0450c;p=platal.git

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

a16cf1c2e56cc6e4c6cda1e984d2659c4cf0450c