Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Tue, 12 Jun 2012 18:22:51 +0000 (20:22 +0200)
committerStéphane Jacob <sj@m4x.org>
Tue, 12 Jun 2012 18:22:51 +0000 (20:22 +0200)
commit5f9ad38e8805cd275f2943494b8b692601a39c9c
tree6230da8d7253b9bf8739235068c9b1814dd933cd
parente9a46d1a6839b5efc9a651a601fca80b9af70e7f
parent3092eea7b21ac2a3ce18277a1a26af4027e96941
Merge branch 'xorg/maint' into xorg/master