Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Tue, 28 Jun 2011 21:51:17 +0000 (23:51 +0200)
committerStéphane Jacob <sj@m4x.org>
Tue, 28 Jun 2011 21:51:17 +0000 (23:51 +0200)
commitcbdcd130c8e5189a62587da35f37ea51eddf64b5
treeef2e431e17feffa4f5714371809d962b478ddf19
parente3abf9d623017324c7ed3f1537a1c437d85e0537
parentf7d43ed53508bacc955e4964af2b4071ac906c6d
Merge branch 'xorg/maint' into xorg/master