Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Mon, 16 May 2011 08:07:44 +0000 (10:07 +0200)
committerStéphane Jacob <sj@m4x.org>
Mon, 16 May 2011 08:07:44 +0000 (10:07 +0200)
commit85fd04406cd481f50ce9326adce1ec3201c55478
tree6c90a495e8ceb2e73910ff2d0703514f45a60f56
parentf9cb6f48750e291f7e4a1163d012068da4a0457a
parenta51d0d30df9f951fe83688d49a172edaba453d63
Merge branch 'xorg/maint' into xorg/master