Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Sat, 24 Mar 2012 09:59:03 +0000 (10:59 +0100)
committerStéphane Jacob <sj@m4x.org>
Sat, 24 Mar 2012 09:59:03 +0000 (10:59 +0100)
commitcfceef1ef8148bef4f7d1319ceabe43096110332
tree12714f5aeeb2fea30dd5f81668872e5d33740e02
parent53a6caf435b7b8d459f0b52189e4988d43d7405d
parent2b2cd7aab12d27b32cb996bd5b61e5dad155fc21
Merge branch 'xorg/maint' into xorg/master