Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Sat, 19 Nov 2011 14:29:45 +0000 (15:29 +0100)
committerStéphane Jacob <sj@m4x.org>
Sat, 19 Nov 2011 14:29:45 +0000 (15:29 +0100)
commit10a54c4e0ccd0972a2364055982d900c04cfd820
tree8534e9f9d2150b954fc1880671e1c325edc09538
parentc0d4dad8b8e2112e8e7bcf3353ee6a39beef08c5
parentd521d089aacaa9730e5bb4443220711895166de4
Merge branch 'xorg/maint' into xorg/master