From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Mon, 5 Jan 2009 20:22:07 +0000 (+0100)
Subject: Merge commit 'origin/fusionax' into account
X-Git-Tag: xorg/1.0.0~332^2~425
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=1ebf2b93bef5ab13342293a34041b9a68ed31f03;p=platal.git

Merge commit 'origin/fusionax' into account

Conflicts:

	core

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

1ebf2b93bef5ab13342293a34041b9a68ed31f03