[xorg-x11-server/f14/master: 2/2] Merge branch 'master' into f14

[Adam Jackson]

commit dfafcd4b739b04b348c94307c1162275fd249723
Merge: f385151 a63afa4
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Oct 5 13:32:28 2010 -0400

    Merge branch 'master' into f14

 xorg-x11-server.spec             |    7 +++++--
 xserver-1.9.0-vbe-insanity.patch |    2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)
---