Merge xorg/maint into xorg/master
authorRaphaël Barrois <raphael.barrois@polytechnique.org>
Fri, 16 Nov 2012 22:10:20 +0000 (23:10 +0100)
committerRaphaël Barrois <raphael.barrois@polytechnique.org>
Fri, 16 Nov 2012 22:10:20 +0000 (23:10 +0100)
commit5080ccc85fd85bc2e3d06f152830c26509b8b8d8
tree9965bbfecbbd6adfce359f75ab3395020745b7d2
parent4509ad2c237207ad06a66ec2d6f493cc9abf26a6
parente44e7234c528fa186f080af20317a23f3a414784
Merge xorg/maint into xorg/master