Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Sun, 10 Jul 2011 21:45:02 +0000 (23:45 +0200)
committerStéphane Jacob <sj@m4x.org>
Sun, 10 Jul 2011 21:45:02 +0000 (23:45 +0200)
commit166ae27cbb59e826d23b34fc5c73dce3572e8122
treee8184874fd6acd9e1f4c7036fedf1cf453c79779
parent2c848e7d82d75b399e415d123567a5d66a0bf1e4
parent222195aa503167e7c2f323f642d643d4acd11bcf
Merge branch 'xorg/maint' into xorg/master