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

[Adam Jackson]

commit f385151a8d7b26a7aec84cca4a364395651b4bdd
Merge: 961662e 755a6a3
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Oct 4 13:29:44 2010 -0400

    Merge branch 'master' into f14

 xorg-x11-server.spec             |   10 ++++-
 xserver-1.9.0-vbe-insanity.patch |   86 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 95 insertions(+), 1 deletions(-)
---