xserver: Branch 'master'

[Alan Coopersmith]

 hw/kdrive/ephyr/Xephyr.man.pre |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3853314d13b503684c9922715323f8033febe5de
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Thu Sep 17 08:11:27 2009 -0700

    Fix typo in Xephyr man page
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>

diff --git a/hw/kdrive/ephyr/Xephyr.man.pre b/hw/kdrive/ephyr/Xephyr.man.pre
index f5e8b98..0082569 100644
--- a/hw/kdrive/ephyr/Xephyr.man.pre
+++ b/hw/kdrive/ephyr/Xephyr.man.pre
@@ -23,7 +23,7 @@ Xephyr - X server outputting to a window on a pre-existing X display
 .IR ... ]
 .SH DESCRIPTION
 .B Xephyr
-is a a kdrive server that outputs to a window on a pre-existing "host"
+is a kdrive server that outputs to a window on a pre-existing "host"
 X display.
 Think
 .I Xnest