Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Fri, 13 May 2011 09:10:09 +0000 (11:10 +0200)
committerStéphane Jacob <sj@m4x.org>
Fri, 13 May 2011 09:10:09 +0000 (11:10 +0200)
commit18d4bfef9ab67ed8a83fd04f7b2cbf51ef97b02f
treef1b524d7db6b01f7217abb3ab9875bd4183ce73a
parent2d953324a0046e58a159099953acb21b4a6d8ce8
parent0cfb2bcb8c18a2d7cc524defc08720dad7b973a5
Merge branch 'xorg/maint' into xorg/master