From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sun, 1 Feb 2009 13:28:20 +0000 (+0100)
Subject: Merge commit 'origin/master' into fusionax
X-Git-Tag: xorg/1.0.0~332^2~344^2~25
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=4a55e7da9dd68b35034d207a25d8ffb292f30403;p=platal.git

Merge commit 'origin/master' into fusionax

Conflicts:

	core

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---

4a55e7da9dd68b35034d207a25d8ffb292f30403