Merge remote branch 'origin/xorg/master' into xorg/f/surveys
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Wed, 9 Mar 2011 21:25:39 +0000 (22:25 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Wed, 9 Mar 2011 21:25:39 +0000 (22:25 +0100)
commit2f45364df629712cf16e3e3670289c6260277199
tree0a43fae9878b24c26700511c85a9f599cbf12465
parent0a67b90d7ded859eb20f89fef5089a0016c51eae
parent88aa48e8cd4487759ab651049f4aa18aa7deb163
Merge remote branch 'origin/xorg/master' into xorg/f/surveys

Conflicts:
core

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