Merge branch 'xorg/maint' into xorg/master
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Thu, 7 Apr 2011 20:18:25 +0000 (22:18 +0200)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Thu, 7 Apr 2011 20:18:25 +0000 (22:18 +0200)
commit1e7aeba246f8a66530e8d4108c7b14bd68a6dc02
treef9c6db3e2e72e9cbaee446ad61cd3574312768d1
parent59c83511ef0fba3c60049f81b114092ce03690e2
parente0f5334f5f3f9bb0dc29c644b54115388fd5b4e5
Merge branch 'xorg/maint' into xorg/master

Conflicts:
core

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