From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sat, 15 Nov 2008 16:12:58 +0000 (+0100)
Subject: Merge commit 'origin/master' into fusionax
X-Git-Tag: xorg/1.0.0~332^2~497
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=b159e33797ccfb84478dd2dbde700c7d1867539f;p=platal.git

Merge commit 'origin/master' into fusionax

Conflicts:

	core

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

b159e33797ccfb84478dd2dbde700c7d1867539f