Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Sun, 3 Jun 2012 10:41:04 +0000 (12:41 +0200)
committerStéphane Jacob <sj@m4x.org>
Sun, 3 Jun 2012 10:41:04 +0000 (12:41 +0200)
commit08b5c28f7adf245d5a262add9c31209f5d188ec7
treef55ed55b074a611d2131b432458e13730c375fed
parent3ed6d317e311149fe36eef9b36870471b677e836
parentf903d3b20f14b1bab6b85b03efe1802f7bf60363
Merge branch 'xorg/maint' into xorg/master