Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Mon, 28 Mar 2011 13:04:50 +0000 (15:04 +0200)
committerStéphane Jacob <sj@m4x.org>
Mon, 28 Mar 2011 13:04:50 +0000 (15:04 +0200)
commit3d964835e8ff04f0f86c80aea026b82896cb4a46
treedbc62173d029ad49af50b2660d7cfd7be88a77b7
parenta5122b6480994a35fe6c0d88ccd9c6dfff761364
parenta9ec92989943725b07ba678ff7a00eb7d9b6f415
Merge branch 'xorg/maint' into xorg/master