Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Sat, 16 Apr 2011 22:00:04 +0000 (00:00 +0200)
committerStéphane Jacob <sj@m4x.org>
Sat, 16 Apr 2011 22:00:04 +0000 (00:00 +0200)
commit87c297112074d1da4773359b7c9d17d5fab0ff1b
tree6fb4365abf35c1bc267d7a99e98278d25f7c93b6
parent312d41ce38d7845aaaf738a30654b27182e58e4f
parent4df10c3bc9c29578548160615ee9ded183dee23d
Merge branch 'xorg/maint' into xorg/master