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

[Adam Tkac]

commit 961662e6115eef81bd33bfb15f12a0126a22014f
Merge: 2ec87f0 8816acb
Author: Adam Tkac <atkac at redhat.com>
Date:   Thu Sep 16 11:22:12 2010 +0200

    Merge remote branch 'origin/master' into f14

 xorg-x11-server.spec |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
---