Merge xorg/maint into xorg/master
authorRaphaël Barrois <raphael.barrois@polytechnique.org>
Wed, 14 Nov 2012 23:34:50 +0000 (00:34 +0100)
committerRaphaël Barrois <raphael.barrois@polytechnique.org>
Wed, 14 Nov 2012 23:34:50 +0000 (00:34 +0100)
commit57429ea447195202064ba5a3958e8844939059e9
tree3ea8ddde960e8c5743ca101ee05d9e1696f8d114
parent132f43a4fef8b2b8eef251fda5035bee1927bea9
parent18aff96c1b7b7d90982ac788ac46a4c5266e877e
Merge xorg/maint into xorg/master

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
core