Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Thu, 22 Sep 2011 07:43:00 +0000 (09:43 +0200)
committerStéphane Jacob <sj@m4x.org>
Thu, 22 Sep 2011 07:43:00 +0000 (09:43 +0200)
commit1ea2d001c2511d30bae13fe3aed0e698919380a8
tree39f5f7cc26ac62d4748d9d33ace7a4bcee1b3f28
parent009f4a24bd8743b2cf180b59cb2a2d90ff3f8640
parent15b9758d68d315d2600af1741b36b44efe3b2cef
Merge branch 'xorg/maint' into xorg/master