Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Mon, 16 May 2011 13:00:13 +0000 (15:00 +0200)
committerStéphane Jacob <sj@m4x.org>
Mon, 16 May 2011 13:00:13 +0000 (15:00 +0200)
commite50f74d50fb29c50325120aec408611c9407c6d9
treece1e7f4d47d2a76da1a68bb0bdf2dbde5b59f65a
parentacc276daf2b9768b549504c64c94679e9c8ddd27
parent0b4f3e3cd5fe69c1b5bfa6890adeb76714521a02
Merge branch 'xorg/maint' into xorg/master