xserver: Branch 'master'

[Adam Jackson]

 include/servermd.h |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 9e0e558f263a132babf8c91d31230831653f19c1
Author: Adam Jackson <ajax at redhat.com>
Date:   Fri Jun 13 11:17:49 2008 -0400

    Fix unterminated endif.

diff --git a/include/servermd.h b/include/servermd.h
index 0bfa7a0..91b705b 100644
--- a/include/servermd.h
+++ b/include/servermd.h
@@ -179,6 +179,8 @@ SOFTWARE.
 #define BITMAP_BIT_ORDER        MSBFirst
 #define GLYPHPADBYTES           4
 
+#endif /* AIXV3 */
+
 #if defined(ibm032) || defined (ibm)
 
 #ifdef __i386__