Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Tue, 28 Jun 2011 17:04:50 +0000 (19:04 +0200)
committerStéphane Jacob <sj@m4x.org>
Tue, 28 Jun 2011 17:04:50 +0000 (19:04 +0200)
commite22ff176d83e1f4ffd866e6ad928ee247906c6a5
tree1c4cacc69dc6b8e96af7ed87153d5517ce597650
parentbe1a47bf9f2dae8406c496e2271e6027ddff2eab
parentd06058a9e6fa9ec20f6838ff959d25484b29648e
Merge branch 'xorg/maint' into xorg/master
core