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

Merge commit 'origin/fusionax' into account

Conflicts:

	core

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

524d1205c09d3f8e14a5751b2cbbce7e2fd23008