xserver: Branch 'master'

[Eamon Walsh]

 Xext/xace.c     |    2 +-
 Xext/xace.h     |    2 +-
 Xext/xacestr.h  |    2 +-
 Xext/xselinux.c |    2 +-
 Xext/xselinux.h |    2 +-
 dix/registry.c  |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit a470e8426ee290046a927a17fc969235c4b1e2e7
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date:   Wed Sep 2 17:56:52 2009 -0400

    Correct outdated e-mail address in "Author" statements.
    
    Signed-off-by: Eamon Walsh <ewalsh at tycho.nsa.gov>

diff --git a/Xext/xace.c b/Xext/xace.c
index 5b9a840..bf0e98f 100644
--- a/Xext/xace.c
+++ b/Xext/xace.c
@@ -1,6 +1,6 @@
 /************************************************************
 
-Author: Eamon Walsh <ewalsh at epoch.ncsc.mil>
+Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/Xext/xace.h b/Xext/xace.h
index 0f803f9..6029d87 100644
--- a/Xext/xace.h
+++ b/Xext/xace.h
@@ -1,6 +1,6 @@
 /************************************************************
 
-Author: Eamon Walsh <ewalsh at epoch.ncsc.mil>
+Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/Xext/xacestr.h b/Xext/xacestr.h
index ba115a4..84216c8 100644
--- a/Xext/xacestr.h
+++ b/Xext/xacestr.h
@@ -1,6 +1,6 @@
 /************************************************************
 
-Author: Eamon Walsh <ewalsh at epoch.ncsc.mil>
+Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index a199a0e..b9b16b6 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -1,6 +1,6 @@
 /************************************************************
 
-Author: Eamon Walsh <ewalsh at epoch.ncsc.mil>
+Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/Xext/xselinux.h b/Xext/xselinux.h
index e4a2ec2..e99f05b 100644
--- a/Xext/xselinux.h
+++ b/Xext/xselinux.h
@@ -1,6 +1,6 @@
 /************************************************************
 
-Author: Eamon Walsh <ewalsh at epoch.ncsc.mil>
+Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/dix/registry.c b/dix/registry.c
index a519cff..ec853b3 100644
--- a/dix/registry.c
+++ b/dix/registry.c
@@ -1,6 +1,6 @@
 /************************************************************
 
-Author: Eamon Walsh <ewalsh at epoch.ncsc.mil>
+Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that