Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Tue, 13 Sep 2011 17:59:10 +0000 (19:59 +0200)
committerStéphane Jacob <sj@m4x.org>
Tue, 13 Sep 2011 17:59:10 +0000 (19:59 +0200)
commit959221f7482b51bb1b3f03d86aeabc0bd246205a
tree9a029daadb4f190afea88515828a68e589ff32e0
parent75d4576e39af9175f9912cc4635524f5a73e1872
parentff231bddbf612e500cee842c8d6c7fce36060be2
Merge branch 'xorg/maint' into xorg/master