From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Wed, 9 Mar 2011 21:25:39 +0000 (+0100)
Subject: Merge remote branch 'origin/xorg/master' into xorg/f/surveys
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=2f45364df629712cf16e3e3670289c6260277199;p=platal.git

Merge remote branch 'origin/xorg/master' into xorg/f/surveys

Conflicts:
	core

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

2f45364df629712cf16e3e3670289c6260277199