[66512] trunk/dports/x11/xorg-server-devel

jeremyhu at macports.org jeremyhu at macports.org
Thu Apr 15 17:13:30 PDT 2010


Revision: 66512
          http://trac.macports.org/changeset/66512
Author:   jeremyhu at macports.org
Date:     2010-04-15 17:13:29 -0700 (Thu, 15 Apr 2010)
Log Message:
-----------
xorg-server-devel: Pull in updates from git including some crashers and GLX fixes.

Modified Paths:
--------------
    trunk/dports/x11/xorg-server-devel/Portfile

Added Paths:
-----------
    trunk/dports/x11/xorg-server-devel/files/0001-Convert-x86emu-fixed-size-int-typedefs-to-use-stdint.patch
    trunk/dports/x11/xorg-server-devel/files/0002-dix-be-more-verbose-when-we-run-out-of-opcodes.patch
    trunk/dports/x11/xorg-server-devel/files/0003-doc-specify-1.6.1-as-the-minimum-version-for-doxygen.patch
    trunk/dports/x11/xorg-server-devel/files/0004-Don-t-keep-a-pointer-to-a-possibly-freed-cursor-when.patch
    trunk/dports/x11/xorg-server-devel/files/0005-config-only-match-sane-devices-in-10-evdev.conf.patch
    trunk/dports/x11/xorg-server-devel/files/0006-xfree86-Allow-adding-sysconfdir-and-datadir-to-confi.patch
    trunk/dports/x11/xorg-server-devel/files/0007-xfree86-Document-how-configdir-affects-the-xorg.conf.patch
    trunk/dports/x11/xorg-server-devel/files/0008-xfree86-Set-a-saner-search-path-for-xorg.conf.d.patch
    trunk/dports/x11/xorg-server-devel/files/0009-xfree86-Search-for-a-system-xorg.conf.d.patch
    trunk/dports/x11/xorg-server-devel/files/0010-Move-10-evdev.conf-to-system-config-dir-datadir-X11-.patch
    trunk/dports/x11/xorg-server-devel/files/0011-xfree86-remove-dead-input-drivers-from-xorg.conf-man.patch
    trunk/dports/x11/xorg-server-devel/files/0012-Disable-setuid-configure-test-on-Cygwin.patch
    trunk/dports/x11/xorg-server-devel/files/0013-Cygwin-X-Disable-unsupported-extensions-in-configure.patch
    trunk/dports/x11/xorg-server-devel/files/0014-Don-t-enable-ROOTLESS_WORKAROUND-it-breaks-composite.patch
    trunk/dports/x11/xorg-server-devel/files/0015-Cygwin-X-Add-configure-option-for-WindowsWM.patch
    trunk/dports/x11/xorg-server-devel/files/0016-XQuartz-Blacklist-some-oddball-legacy-Mac-keycodes-t.patch
    trunk/dports/x11/xorg-server-devel/files/0017-XQuartz-Add-a-defaults-option-to-toggle-Alt-Mode_swi.patch
    trunk/dports/x11/xorg-server-devel/files/0018-XQuartz-Customize-the-NSDefaults-id-in-the-man-file.patch
    trunk/dports/x11/xorg-server-devel/files/0019-XQuartz-Add-a-GUI-preference-for-the-Alt-Mode_switch.patch
    trunk/dports/x11/xorg-server-devel/files/0020-XGE-don-t-register-an-extension-event.patch
    trunk/dports/x11/xorg-server-devel/files/0021-xfree86-Fix-priority-ordering-for-ignoring-input-cla.patch
    trunk/dports/x11/xorg-server-devel/files/0023-XQuartz-Fix-possible-NULL-dereference-in-ListenOnOpe.patch
    trunk/dports/x11/xorg-server-devel/files/0024-XQuartz-GLX-Don-t-let-garbage-enter-our-pixel-reques.patch
    trunk/dports/x11/xorg-server-devel/files/0025-fb-Revert-fb-changes-that-broke-XQuartz.patch

Removed Paths:
-------------
    trunk/dports/x11/xorg-server-devel/files/0001-fb-Revert-fb-changes-that-broke-XQuartz.patch

Modified: trunk/dports/x11/xorg-server-devel/Portfile
===================================================================
--- trunk/dports/x11/xorg-server-devel/Portfile	2010-04-16 00:04:00 UTC (rev 66511)
+++ trunk/dports/x11/xorg-server-devel/Portfile	2010-04-16 00:13:29 UTC (rev 66512)
@@ -5,6 +5,7 @@
 name		xorg-server-devel
 set my_name	xorg-server
 version		1.8.0
+revision        1
 categories	x11 devel
 maintainers	jeremyhu openmaintainer
 description	The X.org / Xquartz X server.
@@ -74,7 +75,31 @@
 # GL/internal/dri_interface.h is missing in prefix (provided by libdrm for the xorg DDX... not helpful for us)
 configure.cppflags-append -I/usr/include -I${filespath}/dri
 
-patchfiles 0001-fb-Revert-fb-changes-that-broke-XQuartz.patch 
+patchfiles \
+        0001-Convert-x86emu-fixed-size-int-typedefs-to-use-stdint.patch \
+        0002-dix-be-more-verbose-when-we-run-out-of-opcodes.patch \
+        0003-doc-specify-1.6.1-as-the-minimum-version-for-doxygen.patch \
+        0004-Don-t-keep-a-pointer-to-a-possibly-freed-cursor-when.patch \
+        0005-config-only-match-sane-devices-in-10-evdev.conf.patch \
+        0006-xfree86-Allow-adding-sysconfdir-and-datadir-to-confi.patch \
+        0007-xfree86-Document-how-configdir-affects-the-xorg.conf.patch \
+        0008-xfree86-Set-a-saner-search-path-for-xorg.conf.d.patch \
+        0009-xfree86-Search-for-a-system-xorg.conf.d.patch \
+        0010-Move-10-evdev.conf-to-system-config-dir-datadir-X11-.patch \
+        0011-xfree86-remove-dead-input-drivers-from-xorg.conf-man.patch \
+        0012-Disable-setuid-configure-test-on-Cygwin.patch \
+        0013-Cygwin-X-Disable-unsupported-extensions-in-configure.patch \
+        0014-Don-t-enable-ROOTLESS_WORKAROUND-it-breaks-composite.patch \
+        0015-Cygwin-X-Add-configure-option-for-WindowsWM.patch \
+        0016-XQuartz-Blacklist-some-oddball-legacy-Mac-keycodes-t.patch \
+        0017-XQuartz-Add-a-defaults-option-to-toggle-Alt-Mode_swi.patch \
+        0018-XQuartz-Customize-the-NSDefaults-id-in-the-man-file.patch \
+        0019-XQuartz-Add-a-GUI-preference-for-the-Alt-Mode_switch.patch \
+        0020-XGE-don-t-register-an-extension-event.patch \
+        0021-xfree86-Fix-priority-ordering-for-ignoring-input-cla.patch \
+        0023-XQuartz-Fix-possible-NULL-dereference-in-ListenOnOpe.patch \
+        0024-XQuartz-GLX-Don-t-let-garbage-enter-our-pixel-reques.patch \
+        0025-fb-Revert-fb-changes-that-broke-XQuartz.patch
 
 patch.args -p1
 

Added: trunk/dports/x11/xorg-server-devel/files/0001-Convert-x86emu-fixed-size-int-typedefs-to-use-stdint.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0001-Convert-x86emu-fixed-size-int-typedefs-to-use-stdint.patch	                        (rev 0)
+++ trunk/dports/x11/xorg-server-devel/files/0001-Convert-x86emu-fixed-size-int-typedefs-to-use-stdint.patch	2010-04-16 00:13:29 UTC (rev 66512)
@@ -0,0 +1,87 @@
+From 5201d3c230e52c9d1ba90ab1712307541e024a6b Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <alan.coopersmith at oracle.com>
+Date: Thu, 8 Apr 2010 14:01:21 -0700
+Subject: [PATCH 01/25] Convert x86emu fixed size int typedefs to use stdint types
+
+Fixes x86emu builds when using non-gnu compilers now that u64 is required
+
+Before this fix, the u64 type would not be defined, causing
+x86emu/sys.c to fail to build:
+"sys.c", line 102: syntax error before or at: ldq_u
+"sys.c", line 102: syntax error before or at: *
+
+Since Keith requested using <stdint.h>, converted all the x86emu
+typedefs to use the stdint types.
+
+Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
+Acked-by: Matt Turner <mattst88 at gmail.com>
+Acked-by: Tiago Vignatti <tiago.vignatti at nokia.com>
+Signed-off-by: Keith Packard <keithp at keithp.com>
+(cherry picked from commit 82cf3a4ae01811917f7903d6f62ba9b7132adf7e)
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+---
+ hw/xfree86/x86emu/x86emu/types.h |   42 ++++++++-----------------------------
+ 1 files changed, 9 insertions(+), 33 deletions(-)
+
+diff --git xorg-server-1.8.0/hw/xfree86/x86emu/x86emu/types.h xorg-server-1.8.0/hw/xfree86/x86emu/x86emu/types.h
+index c18e11c..fa23800 100644
+--- xorg-server-1.8.0/hw/xfree86/x86emu/x86emu/types.h
++++ xorg-server-1.8.0/hw/xfree86/x86emu/x86emu/types.h
+@@ -61,45 +61,21 @@
+ 
+ /*---------------------- Macros and type definitions ----------------------*/
+ 
+-/* Currently only for Linux/32bit */
+-#undef  __HAS_LONG_LONG__
+-#if defined(__GNUC__) && !defined(NO_LONG_LONG)
+-#define __HAS_LONG_LONG__
+-#endif
+-
+-/* Taken from Xmd.h */
+-#undef NUM32
+-#if defined (_LP64) || \
+-    defined(__alpha) || defined(__alpha__) || \
+-    defined(__ia64__) || defined(ia64) || \
+-    defined(__sparc64__) || \
+-    defined(__s390x__) || \
+-    defined(__hppa__) && defined(__LP64) || \
+-    defined(__amd64__) || defined(amd64) 
+-#define NUM32 int
+-#else
+-#define NUM32 long
+-#endif
++#include <stdint.h>
+ 
+-typedef unsigned char 		u8;
+-typedef unsigned short 		u16;
+-typedef unsigned NUM32 		u32;
+-#ifdef __HAS_LONG_LONG__
+-typedef unsigned long long 	u64;
+-#endif
++typedef uint8_t				u8;
++typedef uint16_t			u16;
++typedef uint32_t			u32;
++typedef uint64_t	 		u64;
+ 
+-typedef char 				s8;
+-typedef short 				s16;
+-typedef NUM32 				s32;
+-#ifdef __HAS_LONG_LONG__
+-typedef long long 			s64;
+-#endif
++typedef int8_t 				s8;
++typedef int16_t				s16;
++typedef int32_t				s32;
++typedef int64_t				s64;
+ 
+ typedef unsigned int			uint;
+ typedef int 				sint;
+ 
+ typedef u16 X86EMU_pioAddr;
+ 
+-#undef NUM32
+-
+ #endif	/* __X86EMU_TYPES_H */
+-- 
+1.7.0.4
+

Deleted: trunk/dports/x11/xorg-server-devel/files/0001-fb-Revert-fb-changes-that-broke-XQuartz.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0001-fb-Revert-fb-changes-that-broke-XQuartz.patch	2010-04-16 00:04:00 UTC (rev 66511)
+++ trunk/dports/x11/xorg-server-devel/files/0001-fb-Revert-fb-changes-that-broke-XQuartz.patch	2010-04-16 00:13:29 UTC (rev 66512)
@@ -1,231 +0,0 @@
-From c26516e77b9c8e028d202d5fe1a316c680a08f3f Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu at apple.com>
-Date: Fri, 12 Feb 2010 19:48:52 -0800
-Subject: [PATCH 1/2] fb: Revert fb changes that broke XQuartz
-
-http://bugs.freedesktop.org/show_bug.cgi?id=26124
-
-Revert "Fix source pictures getting random transforms after 2d6a8f668342a5190cdf43b5."
-Revert "fb: Adjust transform or composite coordinates for pixman operations"
-
-http://bugs.freedesktop.org/26124
-
-This reverts commit a72c65e9176c51de95db2fdbf4c5d946a4911695.
-This reverts commit a6bd5d2e482a5aa84acb3d4932e2a166d8670ef1.
-
-Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
----
- fb/fb.h     |    7 +----
- fb/fbpict.c |   72 ++++++++++++++++++-----------------------------------------
- fb/fbtrap.c |    6 +---
- 3 files changed, 26 insertions(+), 59 deletions(-)
-
-diff --git xorg-server-1.8.0/fb/fb.h xorg-server-1.8.0/fb/fb.h
-index 02d6c03..ed21f9e 100644
---- xorg-server-1.8.0/fb/fb.h
-+++ xorg-server-1.8.0/fb/fb.h
-@@ -2082,11 +2082,8 @@ fbFillRegionSolid (DrawablePtr	pDrawable,
- 		   FbBits	xor);
- 
- extern _X_EXPORT pixman_image_t *
--image_from_pict (PicturePtr	pict,
--		 Bool		has_clip,
--		 int		*xoff,
--		 int		*yoff);
--
-+image_from_pict (PicturePtr pict,
-+		 Bool       has_clip);
- extern _X_EXPORT void free_pixman_pict (PicturePtr, pixman_image_t *);
- 
- #endif /* _FB_H_ */
-diff --git xorg-server-1.8.0/fb/fbpict.c xorg-server-1.8.0/fb/fbpict.c
-index dddfce8..07a2286 100644
---- xorg-server-1.8.0/fb/fbpict.c
-+++ xorg-server-1.8.0/fb/fbpict.c
-@@ -158,24 +158,19 @@ fbComposite (CARD8      op,
- 	     CARD16     height)
- {
-     pixman_image_t *src, *mask, *dest;
--    int src_xoff, src_yoff;
--    int msk_xoff, msk_yoff;
--    int dst_xoff, dst_yoff;
-     
-     miCompositeSourceValidate (pSrc, xSrc - xDst, ySrc - yDst, width, height);
-     if (pMask)
- 	miCompositeSourceValidate (pMask, xMask - xDst, yMask - yDst, width, height);
-     
--    src = image_from_pict (pSrc, FALSE, &src_xoff, &src_yoff);
--    mask = image_from_pict (pMask, FALSE, &msk_xoff, &msk_yoff);
--    dest = image_from_pict (pDst, TRUE, &dst_xoff, &dst_yoff);
-+    src = image_from_pict (pSrc, TRUE);
-+    mask = image_from_pict (pMask, TRUE);
-+    dest = image_from_pict (pDst, TRUE);
- 
-     if (src && dest && !(pMask && !mask))
-     {
- 	pixman_image_composite (op, src, mask, dest,
--				xSrc + src_xoff, ySrc + src_yoff,
--				xMask + msk_xoff, yMask + msk_yoff,
--				xDst + dst_xoff, yDst + dst_yoff,
-+				xSrc, ySrc, xMask, yMask, xDst, yDst,
- 				width, height);
-     }
- 
-@@ -275,22 +270,22 @@ create_conical_gradient_image (PictGradient *gradient)
- 
- static pixman_image_t *
- create_bits_picture (PicturePtr pict,
--		     Bool       has_clip,
--		     int	*xoff,
--		     int	*yoff)
-+		     Bool       has_clip)
- {
--    PixmapPtr pixmap;
-     FbBits *bits;
-     FbStride stride;
--    int bpp;
-+    int bpp, xoff, yoff;
-     pixman_image_t *image;
-     
--    fbGetDrawablePixmap (pict->pDrawable, pixmap, *xoff, *yoff);
--    fbGetPixmapBitsData(pixmap, bits, stride, bpp);
-+    fbGetDrawable (pict->pDrawable, bits, stride, bpp, xoff, yoff);
-+
-+    bits = (FbBits*)((CARD8*)bits +
-+		     (pict->pDrawable->y + yoff) * stride * sizeof(FbBits) +
-+		     (pict->pDrawable->x + xoff) * (bpp / 8));
- 
-     image = pixman_image_create_bits (
- 	pict->format,
--	pixmap->drawable.width, pixmap->drawable.height,
-+	pict->pDrawable->width, pict->pDrawable->height,
- 	(uint32_t *)bits, stride * sizeof (FbStride));
-     
-     
-@@ -316,52 +311,30 @@ create_bits_picture (PicturePtr pict,
- 	if (pict->clientClipType != CT_NONE)
- 	    pixman_image_set_has_client_clip (image, TRUE);
- 
--	if (*xoff || *yoff)
--	    pixman_region_translate (pict->pCompositeClip, *xoff, *yoff);
-+	pixman_region_translate (pict->pCompositeClip, - pict->pDrawable->x, - pict->pDrawable->y);
- 
- 	pixman_image_set_clip_region (image, pict->pCompositeClip);
- 
--	if (*xoff || *yoff)
--	    pixman_region_translate (pict->pCompositeClip, -*xoff, -*yoff);
-+	pixman_region_translate (pict->pCompositeClip, pict->pDrawable->x, pict->pDrawable->y);
-     }
-     
-     /* Indexed table */
-     if (pict->pFormat->index.devPrivate)
- 	pixman_image_set_indexed (image, pict->pFormat->index.devPrivate);
- 
--    /* Add in drawable origin to position within the image */
--    *xoff += pict->pDrawable->x;
--    *yoff += pict->pDrawable->y;
--
-     return image;
- }
- 
- static void
--set_image_properties (pixman_image_t *image, PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
-+set_image_properties (pixman_image_t *image, PicturePtr pict)
- {
-     pixman_repeat_t repeat;
-     pixman_filter_t filter;
-     
-     if (pict->transform)
-     {
--	/* For source images, adjust the transform to account
--	 * for the drawable offset within the pixman image,
--	 * then set the offset to 0 as it will be used
--	 * to compute positions within the transformed image.
--	 */
--	if (!has_clip) {
--	    struct pixman_transform	adjusted;
--
--	    adjusted = *pict->transform;
--	    pixman_transform_translate(&adjusted,
--				       NULL,
--				       pixman_int_to_fixed(*xoff),
--				       pixman_int_to_fixed(*yoff));
--	    pixman_image_set_transform (image, &adjusted);
--	    *xoff = 0;
--	    *yoff = 0;
--	} else
--	    pixman_image_set_transform (image, pict->transform);
-+	pixman_image_set_transform (
-+	    image, (pixman_transform_t *)pict->transform);
-     }
-     
-     switch (pict->repeatType)
-@@ -388,8 +361,7 @@ set_image_properties (pixman_image_t *image, PicturePtr pict, Bool has_clip, int
-     
-     if (pict->alphaMap)
-     {
--	int alpha_xoff, alpha_yoff;
--	pixman_image_t *alpha_map = image_from_pict (pict->alphaMap, FALSE, &alpha_xoff, &alpha_yoff);
-+	pixman_image_t *alpha_map = image_from_pict (pict->alphaMap, TRUE);
- 	
- 	pixman_image_set_alpha_map (
- 	    image, alpha_map, pict->alphaOrigin.x, pict->alphaOrigin.y);
-@@ -422,7 +394,8 @@ set_image_properties (pixman_image_t *image, PicturePtr pict, Bool has_clip, int
- }
- 
- pixman_image_t *
--image_from_pict (PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
-+image_from_pict (PicturePtr pict,
-+		 Bool has_clip)
- {
-     pixman_image_t *image = NULL;
- 
-@@ -431,7 +404,7 @@ image_from_pict (PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
- 
-     if (pict->pDrawable)
-     {
--	image = create_bits_picture (pict, has_clip, xoff, yoff);
-+	image = create_bits_picture (pict, has_clip);
-     }
-     else if (pict->pSourcePict)
-     {
-@@ -452,11 +425,10 @@ image_from_pict (PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
- 	    else if (sp->type == SourcePictTypeConical)
- 		image = create_conical_gradient_image (gradient);
- 	}
--	*xoff = *yoff = 0;
-     }
-     
-     if (image)
--	set_image_properties (image, pict, has_clip, xoff, yoff);
-+	set_image_properties (image, pict);
-     
-     return image;
- }
-diff --git xorg-server-1.8.0/fb/fbtrap.c xorg-server-1.8.0/fb/fbtrap.c
-index 515e2e1..830603a 100644
---- xorg-server-1.8.0/fb/fbtrap.c
-+++ xorg-server-1.8.0/fb/fbtrap.c
-@@ -40,8 +40,7 @@ fbAddTraps (PicturePtr	pPicture,
- 	    int		ntrap,
- 	    xTrap	*traps)
- {
--    int image_xoff, image_yoff;
--    pixman_image_t *image = image_from_pict (pPicture, FALSE, &image_xoff, &image_yoff);
-+    pixman_image_t *image = image_from_pict (pPicture, FALSE);
- 
-     if (!image)
- 	return;
-@@ -57,8 +56,7 @@ fbRasterizeTrapezoid (PicturePtr    pPicture,
- 		      int	    x_off,
- 		      int	    y_off)
- {
--    int	mask_xoff, mask_yoff;
--    pixman_image_t *image = image_from_pict (pPicture, FALSE, &mask_xoff, &mask_yoff);
-+    pixman_image_t *image = image_from_pict (pPicture, FALSE);
- 
-     if (!image)
- 	return;
--- 
-1.7.0.3
-

Added: trunk/dports/x11/xorg-server-devel/files/0002-dix-be-more-verbose-when-we-run-out-of-opcodes.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0002-dix-be-more-verbose-when-we-run-out-of-opcodes.patch	                        (rev 0)
+++ trunk/dports/x11/xorg-server-devel/files/0002-dix-be-more-verbose-when-we-run-out-of-opcodes.patch	2010-04-16 00:13:29 UTC (rev 66512)
@@ -0,0 +1,41 @@
+From a68b0e27b6c60921c97f61daa2d9d723e0a5d98f Mon Sep 17 00:00:00 2001
+From: Paulo Ricardo Zanoni <pzanoni at mandriva.com>
+Date: Thu, 11 Mar 2010 14:28:18 -0300
+Subject: [PATCH 02/25] dix: be more verbose when we run out of opcodes
+
+If we run out of opcodes, nothing is print on the log, making the
+problem hard to debug. In the current Xserver, if you enable some
+extensions like multibuffer (+2 events) and use nvidia binary driver (+5
+events) you can run out of opcode numbers.
+
+Signed-off-by: Paulo Ricardo Zanoni <pzanoni at mandriva.com>
+Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
+Reviewed-by: Julien Cristau <jcristau at debian.org>
+Signed-off-by: Keith Packard <keithp at keithp.com>
+(cherry picked from commit a9fe7cfa77ccee64d68732dc3f37d35cbfc27a65)
+
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+---
+ dix/extension.c |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git xorg-server-1.8.0/dix/extension.c xorg-server-1.8.0/dix/extension.c
+index fb83af1..f348665 100644
+--- xorg-server-1.8.0/dix/extension.c
++++ xorg-server-1.8.0/dix/extension.c
+@@ -83,8 +83,11 @@ AddExtension(char *name, int NumEvents, int NumErrors,
+     if (!MainProc || !SwappedMainProc || !MinorOpcodeProc)
+         return((ExtensionEntry *) NULL);
+     if ((lastEvent + NumEvents > LAST_EVENT) || 
+-	        (unsigned)(lastError + NumErrors > LAST_ERROR))
++	        (unsigned)(lastError + NumErrors > LAST_ERROR)) {
++        LogMessage(X_ERROR, "Not enabling extension %s: maximum number of "
++                   "events or errors exceeded.\n", name);
+         return((ExtensionEntry *) NULL);
++    }
+ 
+     ext = xalloc(sizeof(ExtensionEntry));
+     if (!ext)
+-- 
+1.7.0.4
+

Added: trunk/dports/x11/xorg-server-devel/files/0003-doc-specify-1.6.1-as-the-minimum-version-for-doxygen.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0003-doc-specify-1.6.1-as-the-minimum-version-for-doxygen.patch	                        (rev 0)
+++ trunk/dports/x11/xorg-server-devel/files/0003-doc-specify-1.6.1-as-the-minimum-version-for-doxygen.patch	2010-04-16 00:13:29 UTC (rev 66512)
@@ -0,0 +1,39 @@
+From 50ddc4af59f41a1c96088c1e22a4917b21aaf098 Mon Sep 17 00:00:00 2001
+From: Gaetan Nadon <memsize at videotron.ca>
+Date: Mon, 5 Apr 2010 19:12:22 -0400
+Subject: [PATCH 03/25] doc: specify 1.6.1 as the minimum version for doxygen.
+
+Older versions generate filenames that are different from
+the ones listed in the Makefile.
+
+Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>
+Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
+Signed-off-by: Keith Packard <keithp at keithp.com>
+(cherry picked from commit 6150595bdbacde13bb4f9aba81b15435089bee94)
+
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+---
+ configure.ac |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git xorg-server-1.8.0/configure.ac xorg-server-1.8.0/configure.ac
+index 591d2b4..a76eda3 100644
+--- xorg-server-1.8.0/configure.ac
++++ xorg-server-1.8.0/configure.ac
+@@ -34,10 +34,10 @@ AM_MAINTAINER_MODE
+ 
+ # Require xorg-macros: XORG_DEFAULT_OPTIONS
+ m4_ifndef([XORG_MACROS_VERSION],
+-          [m4_fatal([must install xorg-macros 1.5 or later before running autoconf/autogen])])
+-XORG_MACROS_VERSION(1.5)
++          [m4_fatal([must install xorg-macros 1.6 or later before running autoconf/autogen])])
++XORG_MACROS_VERSION(1.6)
+ XORG_DEFAULT_OPTIONS
+-XORG_WITH_DOXYGEN
++XORG_WITH_DOXYGEN(1.6.1)
+ 
+ m4_ifndef([XORG_FONT_MACROS_VERSION], [m4_fatal([must install fontutil 1.1 or later before running autoconf/autogen])])
+ XORG_FONT_MACROS_VERSION(1.1)
+-- 
+1.7.0.4
+

Added: trunk/dports/x11/xorg-server-devel/files/0004-Don-t-keep-a-pointer-to-a-possibly-freed-cursor-when.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0004-Don-t-keep-a-pointer-to-a-possibly-freed-cursor-when.patch	                        (rev 0)
+++ trunk/dports/x11/xorg-server-devel/files/0004-Don-t-keep-a-pointer-to-a-possibly-freed-cursor-when.patch	2010-04-16 00:13:29 UTC (rev 66512)
@@ -0,0 +1,29 @@
+From c01250576ffadcd6c4591978b78da878d91ec11c Mon Sep 17 00:00:00 2001
+From: Pierre-Loup A. Griffais <pgriffais at nvidia.com>
+Date: Fri, 2 Apr 2010 12:48:21 -0700
+Subject: [PATCH 04/25] Don't keep a pointer to a possibly freed cursor when changing screens, preventing a crash in xf86CursorEnableDisableFBAccess() trying to restore it.
+
+Signed-off-by: Pierre-Loup A. Griffais <pgriffais at nvidia.com>
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+(cherry picked from commit 6b09f66d8c6ebcee70382b5cca1ba82b68f20afa)
+
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+---
+ hw/xfree86/ramdac/xf86Cursor.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git xorg-server-1.8.0/hw/xfree86/ramdac/xf86Cursor.c xorg-server-1.8.0/hw/xfree86/ramdac/xf86Cursor.c
+index 7f23d9e..f5f0873 100644
+--- xorg-server-1.8.0/hw/xfree86/ramdac/xf86Cursor.c
++++ xorg-server-1.8.0/hw/xfree86/ramdac/xf86Cursor.c
+@@ -312,6 +312,7 @@ xf86CursorSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCurs,
+             xf86SetCursor(pScreen, NullCursor, x, y);
+             ScreenPriv->isUp = FALSE;
+         }
++        ScreenPriv->CurrentCursor = NullCursor;
+         return;
+     }
+ 
+-- 
+1.7.0.4
+

Added: trunk/dports/x11/xorg-server-devel/files/0005-config-only-match-sane-devices-in-10-evdev.conf.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0005-config-only-match-sane-devices-in-10-evdev.conf.patch	                        (rev 0)
+++ trunk/dports/x11/xorg-server-devel/files/0005-config-only-match-sane-devices-in-10-evdev.conf.patch	2010-04-16 00:13:29 UTC (rev 66512)
@@ -0,0 +1,70 @@
+From ad6c5e450cacee3777e7c541d4841ee580339a5d Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer at who-t.net>
+Date: Wed, 7 Apr 2010 10:04:38 +1000
+Subject: [PATCH 05/25] config: only match sane devices in 10-evdev.conf
+
+Having a generic catchall also adds devices like accelerometers. These
+devices make X unusable, hence restrict matching to "known sane" devices
+like pointers, touchpads, keyboards, tablets and touchscreens.
+
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+Acked-by: Julien Cristau <jcristau at debian.org>
+Acked-by: Dan Nicholson <dbn.lists at gmail.com>
+Acked-by: James Cloos <cloos at jhcloos.com>
+(cherry picked from commit c8a608cb6ce8f9c86258c1ab49084f691fa9cc51)
+
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+---
+ config/10-evdev.conf |   36 ++++++++++++++++++++++++++++++++++--
+ 1 files changed, 34 insertions(+), 2 deletions(-)
+
+diff --git xorg-server-1.8.0/config/10-evdev.conf xorg-server-1.8.0/config/10-evdev.conf
+index 7406f4e..cc83ab2 100644
+--- xorg-server-1.8.0/config/10-evdev.conf
++++ xorg-server-1.8.0/config/10-evdev.conf
+@@ -1,8 +1,40 @@
+ #
+ # Catch-all evdev loader for udev-based systems
+-#
++# We don't simply match on any device since that also adds accelerometers
++# and other devices that we don't really want to use. The list below
++# matches everything but joysticks.
++
+ Section "InputClass"
+-        Identifier "evdev-catchall"
++        Identifier "evdev pointer catchall"
++        MatchIsPointer "on"
++        MatchDevicePath "/dev/input/event*"
+         Driver "evdev"
++EndSection
++
++Section "InputClass"
++        Identifier "evdev keyboard catchall"
++        MatchIsKeyboard "on"
+         MatchDevicePath "/dev/input/event*"
++        Driver "evdev"
++EndSection
++
++Section "InputClass"
++        Identifier "evdev touchpad catchall"
++        MatchIsTouchpad "on"
++        MatchDevicePath "/dev/input/event*"
++        Driver "evdev"
++EndSection
++
++Section "InputClass"
++        Identifier "evdev tablet catchall"
++        MatchIsTablet "on"
++        MatchDevicePath "/dev/input/event*"
++        Driver "evdev"
++EndSection
++
++Section "InputClass"
++        Identifier "evdev touchscreen catchall"
++        MatchIsTouchscreen "on"
++        MatchDevicePath "/dev/input/event*"
++        Driver "evdev"
+ EndSection
+-- 
+1.7.0.4
+

Added: trunk/dports/x11/xorg-server-devel/files/0006-xfree86-Allow-adding-sysconfdir-and-datadir-to-confi.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0006-xfree86-Allow-adding-sysconfdir-and-datadir-to-confi.patch	                        (rev 0)
+++ trunk/dports/x11/xorg-server-devel/files/0006-xfree86-Allow-adding-sysconfdir-and-datadir-to-confi.patch	2010-04-16 00:13:29 UTC (rev 66512)
@@ -0,0 +1,75 @@
+From eb07b8606f9a1349baf8114bb36dc2712e5d3419 Mon Sep 17 00:00:00 2001
+From: Dan Nicholson <dbn.lists at gmail.com>
+Date: Sat, 3 Apr 2010 09:33:47 -0700
+Subject: [PATCH 06/25] xfree86: Allow adding sysconfdir and datadir to config search paths
+
+We could just use $projectroot/etc and $projectroot/share, but the user
+might have other plans for them.
+
+Signed-off-by: Dan Nicholson <dbn.lists at gmail.com>
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+(cherry picked from commit 2460e921d18fd264e6f6374be0908f4100442650)
+
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+---
+ hw/xfree86/parser/Makefile.am |    4 +++-
+ hw/xfree86/parser/scan.c      |   14 ++++++++++++++
+ 2 files changed, 17 insertions(+), 1 deletions(-)
+
+diff --git xorg-server-1.8.0/hw/xfree86/parser/Makefile.am xorg-server-1.8.0/hw/xfree86/parser/Makefile.am
+index 49c191f..caf7079 100644
+--- xorg-server-1.8.0/hw/xfree86/parser/Makefile.am
++++ xorg-server-1.8.0/hw/xfree86/parser/Makefile.am
+@@ -34,7 +34,9 @@ libxf86config_a_SOURCES = \
+ 	$(INTERNAL_SOURCES)
+ libxf86config_a_CFLAGS = $(AM_CFLAGS)
+ 
+-AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
++AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) \
++	-DSYSCONFDIR=\"$(sysconfdir)\" \
++	-DDATADIR=\"$(datadir)\"
+ 
+ EXTRA_DIST = \
+ 	Configint.h \
+diff --git xorg-server-1.8.0/hw/xfree86/parser/scan.c xorg-server-1.8.0/hw/xfree86/parser/scan.c
+index cdca9ca..8aab0cf 100644
+--- xorg-server-1.8.0/hw/xfree86/parser/scan.c
++++ xorg-server-1.8.0/hw/xfree86/parser/scan.c
+@@ -599,6 +599,8 @@ xf86pathIsSafe(const char *path)
+  *    %F    config file environment ($XORGCONFIG) as a relative path
+  *    %G    config file environment ($XORGCONFIG) as a safe path
+  *    %P    projroot
++ *    %C    sysconfdir
++ *    %D    datadir
+  *    %M    major version number
+  *    %%    %
+  */
+@@ -615,6 +617,12 @@ xf86pathIsSafe(const char *path)
+ #ifndef PROJECTROOT
+ #define PROJECTROOT	"/usr/X11R6"
+ #endif
++#ifndef SYSCONFDIR
++#define SYSCONFDIR	PROJECTROOT "/etc"
++#endif
++#ifndef DATADIR
++#define DATADIR		PROJECTROOT "/share"
++#endif
+ #ifndef XCONFENV
+ #define XCONFENV	"XORGCONFIG"
+ #endif
+@@ -755,6 +763,12 @@ DoSubstitution(const char *template, const char *cmdline, const char *projroot,
+ 				else
+ 					BAIL_OUT;
+ 				break;
++			case 'C':
++				APPEND_STR(SYSCONFDIR);
++				break;
++			case 'D':
++				APPEND_STR(DATADIR);
++				break;
+ 			case 'M':
+ 				if (!majorvers[0]) {
+ 					if (XF86_VERSION_MAJOR < 0 || XF86_VERSION_MAJOR > 99) {
+-- 
+1.7.0.4
+

Added: trunk/dports/x11/xorg-server-devel/files/0007-xfree86-Document-how-configdir-affects-the-xorg.conf.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0007-xfree86-Document-how-configdir-affects-the-xorg.conf.patch	                        (rev 0)
+++ trunk/dports/x11/xorg-server-devel/files/0007-xfree86-Document-how-configdir-affects-the-xorg.conf.patch	2010-04-16 00:13:29 UTC (rev 66512)
@@ -0,0 +1,76 @@
+From a4516965de447332794ee0afb9503c351fff6fe8 Mon Sep 17 00:00:00 2001
+From: Dan Nicholson <dbn.lists at gmail.com>
+Date: Sat, 3 Apr 2010 09:33:48 -0700
+Subject: [PATCH 07/25] xfree86: Document how -configdir affects the xorg.conf.d search path
+
+Explain the "safe" path dance for -configdir, too.
+
+Signed-off-by: Dan Nicholson <dbn.lists at gmail.com>
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+(cherry picked from commit 2ac33888a9a5766aaf88bc92a8bd1d489873524c)
+
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+---
+ hw/xfree86/doc/man/xorg.conf.man.pre |   36 +++++++++++++++++++++++++++++++++-
+ 1 files changed, 35 insertions(+), 1 deletions(-)
+
+diff --git xorg-server-1.8.0/hw/xfree86/doc/man/xorg.conf.man.pre xorg-server-1.8.0/hw/xfree86/doc/man/xorg.conf.man.pre
+index 93c8ac4..9a40ce3 100644
+--- xorg-server-1.8.0/hw/xfree86/doc/man/xorg.conf.man.pre
++++ xorg-server-1.8.0/hw/xfree86/doc/man/xorg.conf.man.pre
+@@ -102,10 +102,12 @@ is the machine's hostname as reported by
+ .BR gethostname (__libmansuffix__).
+ .PP
+ Additional configuration files are searched for in the following
+-directories:
++directories when the server is started as a normal user:
+ .PP
+ .RS 4
+ .nf
++.IR /etc/X11/ <cmdline>
++.IR __projectroot__/etc/X11/ <cmdline>
+ .I /etc/X11/__xconfigdir__\-4
+ .I /etc/X11/__xconfigdir__
+ .I /etc/__xconfigdir__
+@@ -118,6 +120,38 @@ directories:
+ .fi
+ .RE
+ .PP
++where
++.I <cmdline>
++is a relative path (with no \(lq..\(rq components) specified with the
++.B \-configdir
++command line option.
++.PP
++When the __xservername__ server is started by the \(lqroot\(rq user, the
++config directory search locations are as follows:
++.PP
++.RS 4
++.nf
++<cmdline>
++.IR /etc/X11/ <cmdline>
++.IR __projectroot__/etc/X11/ <cmdline>
++.I /etc/X11/__xconfigdir__\-4
++.I /etc/X11/__xconfigdir__
++.I /etc/__xconfigdir__
++.IR __projectroot__/etc/X11/__xconfigdir__. <hostname>
++.I __projectroot__/etc/X11/__xconfigdir__\-4
++.I __projectroot__/etc/X11/__xconfigdir__
++.IR __projectroot__/lib/X11/__xconfigdir__. <hostname>
++.I __projectroot__/lib/X11/__xconfigdir__\-4
++.I __projectroot__/lib/X11/__xconfigdir__
++.fi
++.RE
++.PP
++where
++.I <cmdline>
++is the path specified with the
++.B \-configdir
++command line option (which may be absolute or relative).
++.PP
+ The
+ .I __xconfigfile__
+ and
+-- 
+1.7.0.4
+

Added: trunk/dports/x11/xorg-server-devel/files/0008-xfree86-Set-a-saner-search-path-for-xorg.conf.d.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0008-xfree86-Set-a-saner-search-path-for-xorg.conf.d.patch	                        (rev 0)
+++ trunk/dports/x11/xorg-server-devel/files/0008-xfree86-Set-a-saner-search-path-for-xorg.conf.d.patch	2010-04-16 00:13:29 UTC (rev 66512)
@@ -0,0 +1,111 @@
+From 0c4a358eae0e77f389380bbbf39d4419f2dd6dcd Mon Sep 17 00:00:00 2001
+From: Dan Nicholson <dbn.lists at gmail.com>
+Date: Sat, 3 Apr 2010 09:33:49 -0700
+Subject: [PATCH 08/25] xfree86: Set a saner search path for xorg.conf.d
+
+There's no reason to carry all the oddities from xorg.conf like appended
+hostname to the search path for xorg.conf.d. This changes it to something
+very simple:
+
+	/etc/X11/<cmdline>
+	$sysconfdir/X11/<cmdline>
+	/etc/X11/xorg.conf.d
+	$sysconfdir/X11/xorg.conf.d
+
+Signed-off-by: Dan Nicholson <dbn.lists at gmail.com>
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+(cherry picked from commit a1bae63dc634a5a79861eab128c63506081f7ed9)
+
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+---
+ cpprules.in                          |    1 +
+ hw/xfree86/common/xf86Config.c       |   16 ++++------------
+ hw/xfree86/doc/man/xorg.conf.man.pre |   22 ++++------------------
+ 3 files changed, 9 insertions(+), 30 deletions(-)
+
+diff --git xorg-server-1.8.0/cpprules.in xorg-server-1.8.0/cpprules.in
+index 301305e..6e43578 100644
+--- xorg-server-1.8.0/cpprules.in
++++ xorg-server-1.8.0/cpprules.in
+@@ -34,6 +34,7 @@ MANDEFS = \
+ 	-D__adminmansuffix__=$(ADMIN_MAN_SUFFIX) \
+ 	-D__mandir__=$(mandir) \
+ 	-D__projectroot__=$(prefix) \
++	-D__sysconfdir__=$(sysconfdir) \
+ 	-D__datadir__=$(datadir) \
+ 	-D__xconfigfile__=$(__XCONFIGFILE__) \
+ 	-D__xconfigdir__=$(__XCONFIGDIR__) \
+diff --git xorg-server-1.8.0/hw/xfree86/common/xf86Config.c xorg-server-1.8.0/hw/xfree86/common/xf86Config.c
+index 718a078..d02c22a 100644
+--- xorg-server-1.8.0/hw/xfree86/common/xf86Config.c
++++ xorg-server-1.8.0/hw/xfree86/common/xf86Config.c
+@@ -97,20 +97,12 @@ extern DeviceAssocRec mouse_assoc;
+ #endif
+ #ifndef ROOT_CONFIGDIRPATH
+ #define ROOT_CONFIGDIRPATH	"%A," "%R," \
+-				"/etc/X11/%R," "%P/etc/X11/%R," \
+-				"/etc/X11/%X-%M," "/etc/X11/%X," "/etc/%X," \
+-				"%P/etc/X11/%X.%H," "%P/etc/X11/%X-%M," \
+-				"%P/etc/X11/%X," \
+-				"%P/lib/X11/%X.%H," "%P/lib/X11/%X-%M," \
+-				"%P/lib/X11/%X"
++				"/etc/X11/%R," "%C/X11/%R," \
++				"/etc/X11/%X," "%C/X11/%X"
+ #endif
+ #ifndef USER_CONFIGDIRPATH
+-#define USER_CONFIGDIRPATH	"/etc/X11/%S," "%P/etc/X11/%S," \
+-				"/etc/X11/%X-%M," "/etc/X11/%X," "/etc/%X," \
+-				"%P/etc/X11/%X.%H," "%P/etc/X11/%X-%M," \
+-				"%P/etc/X11/%X," \
+-				"%P/lib/X11/%X.%H," "%P/lib/X11/%X-%M," \
+-				"%P/lib/X11/%X"
++#define USER_CONFIGDIRPATH	"/etc/X11/%R," "%C/X11/%R," \
++				"/etc/X11/%X," "%C/X11/%X"
+ #endif
+ #ifndef PROJECTROOT
+ #define PROJECTROOT	"/usr/X11R6"
+diff --git xorg-server-1.8.0/hw/xfree86/doc/man/xorg.conf.man.pre xorg-server-1.8.0/hw/xfree86/doc/man/xorg.conf.man.pre
+index 9a40ce3..acfa1ca 100644
+--- xorg-server-1.8.0/hw/xfree86/doc/man/xorg.conf.man.pre
++++ xorg-server-1.8.0/hw/xfree86/doc/man/xorg.conf.man.pre
+@@ -107,16 +107,9 @@ directories when the server is started as a normal user:
+ .RS 4
+ .nf
+ .IR /etc/X11/ <cmdline>
+-.IR __projectroot__/etc/X11/ <cmdline>
+-.I /etc/X11/__xconfigdir__\-4
++.IR __sysconfdir__/X11/ <cmdline>
+ .I /etc/X11/__xconfigdir__
+-.I /etc/__xconfigdir__
+-.IR __projectroot__/etc/X11/__xconfigdir__. <hostname>
+-.I __projectroot__/etc/X11/__xconfigdir__\-4
+-.I __projectroot__/etc/X11/__xconfigdir__
+-.IR __projectroot__/lib/X11/__xconfigdir__. <hostname>
+-.I __projectroot__/lib/X11/__xconfigdir__\-4
+-.I __projectroot__/lib/X11/__xconfigdir__
++.I __sysconfdir__/X11/__xconfigdir__
+ .fi
+ .RE
+ .PP
+@@ -133,16 +126,9 @@ config directory search locations are as follows:
+ .nf
+ <cmdline>
+ .IR /etc/X11/ <cmdline>
+-.IR __projectroot__/etc/X11/ <cmdline>
+-.I /etc/X11/__xconfigdir__\-4
++.IR __sysconfdir__/X11/ <cmdline>
+ .I /etc/X11/__xconfigdir__
+-.I /etc/__xconfigdir__
+-.IR __projectroot__/etc/X11/__xconfigdir__. <hostname>
+-.I __projectroot__/etc/X11/__xconfigdir__\-4
+-.I __projectroot__/etc/X11/__xconfigdir__
+-.IR __projectroot__/lib/X11/__xconfigdir__. <hostname>
+-.I __projectroot__/lib/X11/__xconfigdir__\-4
+-.I __projectroot__/lib/X11/__xconfigdir__
++.I __sysconfdir__/X11/__xconfigdir__
+ .fi
+ .RE
+ .PP
+-- 
+1.7.0.4
+

Added: trunk/dports/x11/xorg-server-devel/files/0009-xfree86-Search-for-a-system-xorg.conf.d.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0009-xfree86-Search-for-a-system-xorg.conf.d.patch	                        (rev 0)
+++ trunk/dports/x11/xorg-server-devel/files/0009-xfree86-Search-for-a-system-xorg.conf.d.patch	2010-04-16 00:13:29 UTC (rev 66512)
@@ -0,0 +1,131 @@
+From 59f96734633fce3c2bee62bce860aed33033ce3e Mon Sep 17 00:00:00 2001
+From: Dan Nicholson <dbn.lists at gmail.com>
+Date: Sat, 3 Apr 2010 10:08:25 -0700
+Subject: [PATCH 09/25] xfree86: Search for a system xorg.conf.d
+
+In addition to the conf files found in /etc/X11 or $sysconfdir/X11 used
+for local administration, we also reserve a system directory for vendor
+and package usage. The simple search path is:
+
+	/usr/share/X11/xorg.conf.d
+	$datadir/X11/xorg.conf.d
+
+Files from these directories will have the lowest config priority. The
+directory $datadir/X11/xorg.conf.d is exported from xorg-server.pc in
+the variable "sysconfigdir". Packages should install their .conf files
+to the directory specified by:
+
+	`pkg-config --variable=sysconfigdir xorg-server`
+
+Signed-off-by: Dan Nicholson <dbn.lists at gmail.com>
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+(cherry picked from commit 95f01bdfee8241371675f0089170fa6b2908d815)
+
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+---
+ configure.ac                         |    2 ++
+ hw/xfree86/common/xf86Config.c       |   12 ++++++++++--
+ hw/xfree86/doc/man/xorg.conf.man.pre |   12 ++++++++++++
+ xorg-server.pc.in                    |    2 ++
+ 4 files changed, 26 insertions(+), 2 deletions(-)
+
+diff --git xorg-server-1.8.0/configure.ac xorg-server-1.8.0/configure.ac
+index a76eda3..48cb724 100644
+--- xorg-server-1.8.0/configure.ac
++++ xorg-server-1.8.0/configure.ac
+@@ -1792,8 +1792,10 @@ if test "x$XORG" = xyes; then
+ 	AC_SUBST([driverdir])
+ 	sdkdir="$includedir/xorg"
+ 	extdir="$includedir/X11/extensions"
++	sysconfigdir="$datadir/X11/$XF86CONFIGDIR"
+ 	AC_SUBST([sdkdir])
+ 	AC_SUBST([extdir])
++	AC_SUBST([sysconfigdir])
+ 	AC_SUBST([logdir])
+ 
+ 	# stuff the ABI versions into the pc file too
+diff --git xorg-server-1.8.0/hw/xfree86/common/xf86Config.c xorg-server-1.8.0/hw/xfree86/common/xf86Config.c
+index d02c22a..1e9543f 100644
+--- xorg-server-1.8.0/hw/xfree86/common/xf86Config.c
++++ xorg-server-1.8.0/hw/xfree86/common/xf86Config.c
+@@ -104,6 +104,9 @@ extern DeviceAssocRec mouse_assoc;
+ #define USER_CONFIGDIRPATH	"/etc/X11/%R," "%C/X11/%R," \
+ 				"/etc/X11/%X," "%C/X11/%X"
+ #endif
++#ifndef SYS_CONFIGDIRPATH
++#define SYS_CONFIGDIRPATH	"/usr/share/X11/%X," "%D/X11/%X"
++#endif
+ #ifndef PROJECTROOT
+ #define PROJECTROOT	"/usr/X11R6"
+ #endif
+@@ -2421,7 +2424,7 @@ checkInput(serverLayoutPtr layout, Bool implicit_layout) {
+ ConfigStatus
+ xf86HandleConfigFile(Bool autoconfig)
+ {
+-    const char *filename, *dirname;
++    const char *filename, *dirname, *sysdirname;
+     char *filesearch, *dirsearch;
+     MessageType filefrom = X_DEFAULT;
+     MessageType dirfrom = X_DEFAULT;
+@@ -2444,6 +2447,8 @@ xf86HandleConfigFile(Bool autoconfig)
+ 	    dirfrom = X_CMDLINE;
+ 
+ 	xf86initConfigFiles();
++	sysdirname = xf86openConfigDirFiles(SYS_CONFIGDIRPATH, NULL,
++					    PROJECTROOT);
+ 	dirname = xf86openConfigDirFiles(dirsearch, xf86ConfigDir, PROJECTROOT);
+ 	filename = xf86openConfigFile(filesearch, xf86ConfigFile, PROJECTROOT);
+ 	if (filename) {
+@@ -2464,7 +2469,10 @@ xf86HandleConfigFile(Bool autoconfig)
+ 			"Unable to locate/open config directory: \"%s\"\n",
+ 			xf86ConfigDir);
+ 	}
+-	if (!filename && !dirname)
++	if (sysdirname)
++	    xf86MsgVerb(X_DEFAULT, 0, "Using system config directory \"%s\"\n",
++			sysdirname);
++	if (!filename && !dirname && !sysdirname)
+ 	    return CONFIG_NOFILE;
+     }
+ 
+diff --git xorg-server-1.8.0/hw/xfree86/doc/man/xorg.conf.man.pre xorg-server-1.8.0/hw/xfree86/doc/man/xorg.conf.man.pre
+index acfa1ca..4782d61 100644
+--- xorg-server-1.8.0/hw/xfree86/doc/man/xorg.conf.man.pre
++++ xorg-server-1.8.0/hw/xfree86/doc/man/xorg.conf.man.pre
+@@ -138,6 +138,18 @@ is the path specified with the
+ .B \-configdir
+ command line option (which may be absolute or relative).
+ .PP
++Finally, configuration files will also be searched for in directories
++reserved for system use. These are to separate configuration files from
++the vendor or 3rd party packages from those of local administration.
++These files are found in the following directories:
++.PP
++.RS 4
++.nf
++.I /usr/share/X11/__xconfigdir__
++.I __datadir__/X11/__xconfigdir__
++.fi
++.RE
++.PP
+ The
+ .I __xconfigfile__
+ and
+diff --git xorg-server-1.8.0/xorg-server.pc.in xorg-server-1.8.0/xorg-server.pc.in
+index 3d58dab..376cb93 100644
+--- xorg-server-1.8.0/xorg-server.pc.in
++++ xorg-server-1.8.0/xorg-server.pc.in
+@@ -2,8 +2,10 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
++datarootdir=@datarootdir@
+ moduledir=@moduledir@
+ sdkdir=@sdkdir@
++sysconfigdir=@sysconfigdir@
+ 
+ abi_ansic=@abi_ansic@
+ abi_videodrv=@abi_videodrv@
+-- 
+1.7.0.4
+

Added: trunk/dports/x11/xorg-server-devel/files/0010-Move-10-evdev.conf-to-system-config-dir-datadir-X11-.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0010-Move-10-evdev.conf-to-system-config-dir-datadir-X11-.patch	                        (rev 0)
+++ trunk/dports/x11/xorg-server-devel/files/0010-Move-10-evdev.conf-to-system-config-dir-datadir-X11-.patch	2010-04-16 00:13:29 UTC (rev 66512)
@@ -0,0 +1,33 @@
+From 3e2ab9139b12b1239eebcbb6c6a23e7284dd7b44 Mon Sep 17 00:00:00 2001
+From: Dan Nicholson <dbn.lists at gmail.com>
+Date: Sat, 3 Apr 2010 09:33:51 -0700
+Subject: [PATCH 10/25] Move 10-evdev.conf to system config dir $datadir/X11/xorg.conf.d
+
+Since the server searches in a vendor specific path now, we can install
+the evdev catchall there without disturbing local administration files.
+
+Signed-off-by: Dan Nicholson <dbn.lists at gmail.com>
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+(cherry picked from commit d4dd3d0085f8eaca8c989aaeace1a1a24c5ebf49)
+
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+---
+ config/Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git xorg-server-1.8.0/config/Makefile.am xorg-server-1.8.0/config/Makefile.am
+index eed7454..675a3b2 100644
+--- xorg-server-1.8.0/config/Makefile.am
++++ xorg-server-1.8.0/config/Makefile.am
+@@ -9,7 +9,7 @@ AM_CFLAGS += $(UDEV_CFLAGS)
+ libconfig_la_SOURCES += udev.c
+ libconfig_la_LIBADD = $(UDEV_LIBS)
+ 
+-xorgconfddir = $(prefix)/etc/X11/$(XF86CONFIGDIR)
++xorgconfddir = $(datadir)/X11/$(XF86CONFIGDIR)
+ xorgconfd_DATA = 10-evdev.conf
+ 
+ else
+-- 
+1.7.0.4
+

Added: trunk/dports/x11/xorg-server-devel/files/0011-xfree86-remove-dead-input-drivers-from-xorg.conf-man.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0011-xfree86-remove-dead-input-drivers-from-xorg.conf-man.patch	                        (rev 0)
+++ trunk/dports/x11/xorg-server-devel/files/0011-xfree86-remove-dead-input-drivers-from-xorg.conf-man.patch	2010-04-16 00:13:29 UTC (rev 66512)
@@ -0,0 +1,49 @@
+From b12f6142f356a72af64665e753c5a4e61b2a6ec1 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer at who-t.net>
+Date: Thu, 8 Apr 2010 13:47:26 +1000
+Subject: [PATCH 11/25] xfree86: remove dead input drivers from xorg.conf man page.
+
+These drivers have been deactivated for over a year now, let's not refer
+potential users to them.
+
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+(cherry picked from commit 03ccbd2579948d11e5f16f88cdf68a55f57c9d26)
+
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+---
+ hw/xfree86/doc/man/xorg.conf.man.pre |    9 ---------
+ 1 files changed, 0 insertions(+), 9 deletions(-)
+
+diff --git xorg-server-1.8.0/hw/xfree86/doc/man/xorg.conf.man.pre xorg-server-1.8.0/hw/xfree86/doc/man/xorg.conf.man.pre
+index 4782d61..f7ff6f6 100644
+--- xorg-server-1.8.0/hw/xfree86/doc/man/xorg.conf.man.pre
++++ xorg-server-1.8.0/hw/xfree86/doc/man/xorg.conf.man.pre
+@@ -2405,25 +2405,16 @@ Display drivers:
+ .PP
+ Input drivers:
+ .BR acecad (__drivermansuffix__),
+-.BR calcomp (__drivermansuffix__),
+ .BR citron (__drivermansuffix__),
+-.BR dmc (__drivermansuffix__),
+-.BR dynapro (__drivermansuffix__),
+ .BR elographics (__drivermansuffix__),
+ .BR evdev (__drivermansuffix__),
+ .BR fpit (__drivermansuffix__),
+-.BR js_x (__drivermansuffix__),
+ .BR joystick (__drivermansuffix__),
+ .BR kbd (__drivermansuffix__),
+-.BR magictouch (__drivermansuffix__),
+-.BR microtouch (__drivermansuffix__),
+ .BR mousedrv (__drivermansuffix__),
+ .BR mutouch (__drivermansuffix__),
+-.BR palmax (__drivermansuffix__),
+ .BR penmount (__drivermansuffix__),
+ .BR synaptics (__drivermansuffix__),
+-.BR tek4957 (__drivermansuffix__),
+-.BR ur98 (__drivermansuffix__),
+ .BR vmmouse (__drivermansuffix__),
+ .BR void (__drivermansuffix__),
+ .BR wacom (__drivermansuffix__).
+-- 
+1.7.0.4
+

Added: trunk/dports/x11/xorg-server-devel/files/0012-Disable-setuid-configure-test-on-Cygwin.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0012-Disable-setuid-configure-test-on-Cygwin.patch	                        (rev 0)
+++ trunk/dports/x11/xorg-server-devel/files/0012-Disable-setuid-configure-test-on-Cygwin.patch	2010-04-16 00:13:29 UTC (rev 66512)
@@ -0,0 +1,29 @@
+From f121ce4d22ff23f16cc374c9a125d3815765bb0c Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
+Date: Mon, 22 Mar 2010 12:47:52 -0500
+Subject: [PATCH 12/25] Disable setuid configure test on Cygwin
+
+Only Xorg is installed setuid, so there is no need to run this configure
+test on Cygwin.
+
+Signed-off-by: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
+(cherry picked from commit 24c9d48cd6999f1e90f9f0e2bbfebd8e95d314d8)
+---
+ configure.ac |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git xorg-server-1.8.0/configure.ac xorg-server-1.8.0/configure.ac
+index 48cb724..1e65c51 100644
+--- xorg-server-1.8.0/configure.ac
++++ xorg-server-1.8.0/configure.ac
+@@ -673,6 +673,7 @@ AC_ARG_ENABLE(install-setuid,
+ AC_MSG_CHECKING([to see if we can install the Xorg server as root])
+ if test "x$SETUID" = "xauto" ; then
+ 	case $host_os in
++	    cygwin*)		SETUID="no"  ;;
+ 	    darwin*)		SETUID="no"  ;;
+ 	    *)
+ 	   	case $host_cpu in
+-- 
+1.7.0.4
+

Added: trunk/dports/x11/xorg-server-devel/files/0013-Cygwin-X-Disable-unsupported-extensions-in-configure.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0013-Cygwin-X-Disable-unsupported-extensions-in-configure.patch	                        (rev 0)
+++ trunk/dports/x11/xorg-server-devel/files/0013-Cygwin-X-Disable-unsupported-extensions-in-configure.patch	2010-04-16 00:13:29 UTC (rev 66512)
@@ -0,0 +1,52 @@
+From 4f2489bdf36ac4d6a340e2a327798a1da394573a Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
+Date: Wed, 24 Mar 2010 00:08:23 -0500
+Subject: [PATCH 13/25] Cygwin/X: Disable unsupported extensions in configure
+
+Several extensions are not supported by XWin, some of which are enabled
+by default in configure.  We forcefully disable these early on so that
+configure will succeed without arguments and without the corresponding
+proto installed.
+
+Signed-off-by: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
+(cherry picked from commit 95c9947f6244d37592958b70760bd1ac885b625a)
+---
+ configure.ac |   14 +++++++++-----
+ 1 files changed, 9 insertions(+), 5 deletions(-)
+
+diff --git xorg-server-1.8.0/configure.ac xorg-server-1.8.0/configure.ac
+index 1e65c51..3176790 100644
+--- xorg-server-1.8.0/configure.ac
++++ xorg-server-1.8.0/configure.ac
+@@ -724,8 +724,16 @@ XORG_CHECK_LINUXDOC
+ dnl Handle installing libxf86config
+ AM_CONDITIONAL(INSTALL_LIBXF86CONFIG, [test "x$INSTALL_LIBXF86CONFIG" = xyes])
+ 
+-dnl XQuartz DDX Detection... Yes, it's ugly to have it here... but we need to handle this early on
++dnl DDX Detection... Yes, it's ugly to have it here... but we need to
++dnl handle this early on so that we don't require unsupported extensions
+ case $host_os in
++	cygwin*)
++		DGA=no
++		DRI2=no
++		XF86VIDMODE=no
++		XSELINUX=no
++		XV=no
++		;;
+ 	darwin*)
+ 		DRI2=no
+ 
+@@ -1877,10 +1885,6 @@ if test "x$XWIN" = xyes; then
+ 
+ 	AC_DEFINE(DDXOSVERRORF, 1, [Use OsVendorVErrorF])
+ 	AC_DEFINE(DDXBEFORERESET, 1, [Use ddxBeforeReset ])
+-	if test "x$XF86VIDMODE" = xyes; then
+-		AC_MSG_NOTICE([Disabling XF86VidMode extension])
+-		XF86VIDMODE=no
+-	fi
+ fi
+ AM_CONDITIONAL(XWIN, [test "x$XWIN" = xyes])
+ AM_CONDITIONAL(XWIN_MULTIWINDOW, [test "x$XWIN" = xyes])
+-- 
+1.7.0.4
+

Added: trunk/dports/x11/xorg-server-devel/files/0014-Don-t-enable-ROOTLESS_WORKAROUND-it-breaks-composite.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0014-Don-t-enable-ROOTLESS_WORKAROUND-it-breaks-composite.patch	                        (rev 0)
+++ trunk/dports/x11/xorg-server-devel/files/0014-Don-t-enable-ROOTLESS_WORKAROUND-it-breaks-composite.patch	2010-04-16 00:13:29 UTC (rev 66512)
@@ -0,0 +1,33 @@
+From 76e548d09195de750a532ee568171b931c1216fe Mon Sep 17 00:00:00 2001
+From: Jon TURNEY <jon.turney at dronecode.org.uk>
+Date: Thu, 18 Feb 2010 14:19:21 -0600
+Subject: [PATCH 14/25] Don't enable ROOTLESS_WORKAROUND, it breaks composite
+
+This possibly brings back whatever the bug is in
+http://bugs.freedesktop.org/show_bug.cgi?id=1168 for
+-rootless mode, but since we don't have reproduction
+steps for that, I can't test that...
+
+Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
+Tested-by: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
+Signed-off-by: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
+(cherry picked from commit 20701522be803fe47e921fcf059dadf64c7f287d)
+---
+ configure.ac |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git xorg-server-1.8.0/configure.ac xorg-server-1.8.0/configure.ac
+index 3176790..f4a7b34 100644
+--- xorg-server-1.8.0/configure.ac
++++ xorg-server-1.8.0/configure.ac
+@@ -1860,7 +1860,6 @@ if test "x$XWIN" = xyes; then
+ 			dnl if we have windowswmproto, build rootless extension for multwindowextwm mode
+ 			if test "x$WINDOWSWM" = xyes ; then
+ 			       AC_DEFINE(ROOTLESS,1,[Build Rootless code])
+-			       CFLAGS="$CFLAGS -DROOTLESS_WORKAROUND"
+ 			fi
+ 			;;
+ 		mingw*)
+-- 
+1.7.0.4
+

Added: trunk/dports/x11/xorg-server-devel/files/0015-Cygwin-X-Add-configure-option-for-WindowsWM.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0015-Cygwin-X-Add-configure-option-for-WindowsWM.patch	                        (rev 0)
+++ trunk/dports/x11/xorg-server-devel/files/0015-Cygwin-X-Add-configure-option-for-WindowsWM.patch	2010-04-16 00:13:29 UTC (rev 66512)
@@ -0,0 +1,70 @@
+From 11afa5e56e9561d214b0a4c13ed60bc2d106fbbb Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
+Date: Wed, 24 Feb 2010 15:17:42 -0600
+Subject: [PATCH 15/25] Cygwin/X: Add configure option for WindowsWM
+
+WindowsWM support is still experimental, and uses the Rootless extension
+which currently breaks the simultaneous build of the other DDXs (see
+commit b3415187e92960cbff784108b5a3a8d130dc34c5).  So we disable it by
+default for now; once the latter issue is fixed we can make this 'auto'.
+
+Signed-off-by: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
+(cherry picked from commit c983f40fe4f30311f31a9df699cdc888709251d0)
+---
+ configure.ac |   21 +++++++++++++--------
+ 1 files changed, 13 insertions(+), 8 deletions(-)
+
+diff --git xorg-server-1.8.0/configure.ac xorg-server-1.8.0/configure.ac
+index f4a7b34..4c1034f 100644
+--- xorg-server-1.8.0/configure.ac
++++ xorg-server-1.8.0/configure.ac
+@@ -644,6 +644,7 @@ AC_ARG_ENABLE(xaa,               AS_HELP_STRING([--enable-xaa], [Build XAA (defa
+ AC_ARG_ENABLE(vgahw,          AS_HELP_STRING([--enable-vgahw], [Build Xorg with vga access (default: enabled)]), [VGAHW=$enableval], [VGAHW=yes])
+ AC_ARG_ENABLE(vbe,            AS_HELP_STRING([--enable-vbe], [Build Xorg with VBE module (default: enabled)]), [VBE=$enableval], [VBE=yes])
+ AC_ARG_ENABLE(int10-module,     AS_HELP_STRING([--enable-int10-module], [Build Xorg with int10 module (default: enabled)]), [INT10MODULE=$enableval], [INT10MODULE=yes])
++AC_ARG_ENABLE(windowswm,      AS_HELP_STRING([--enable-windowswm], [Build XWin with WindowsWM extension (default: no)]), [WINDOWSWM=$enableval], [WINDOWSWM=no])
+ 
+ dnl DDXes.
+ AC_ARG_ENABLE(xorg,    	      AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
+@@ -1845,26 +1846,30 @@ fi
+ AC_MSG_RESULT([$XWIN])
+ 
+ if test "x$XWIN" = xyes; then
+-	PKG_CHECK_EXISTS($WINDOWSWMPROTO, [WINDOWSWM=yes], [WINDOWSWM=no])
+ 	AC_DEFINE_DIR(SYSCONFDIR, sysconfdir, [Location of system.XWinrc])
+ 	AC_DEFINE_DIR(DEFAULT_LOGDIR, logdir, [Default log location])
+ 	AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
+ 	AC_DEFINE_UNQUOTED(__VENDORDWEBSUPPORT__, ["$VENDOR_WEB"], [Vendor web address for support])
+ 	AC_CHECK_TOOL(WINDRES, windres)
++
++	PKG_CHECK_MODULES([XWINMODULES],[x11 xdmcp xau xfont])
++
++	if test "x$WINDOWSWM" = xauto; then
++		PKG_CHECK_EXISTS($WINDOWSWMPROTO, [WINDOWSWM=yes], [WINDOWSWM=no])
++	fi
++	if test "x$WINDOWSWM" = xyes ; then
++		PKG_CHECK_MODULES(WINDOWSWM, $WINDOWSWMPROTO)
++		XWINMODULES_CFLAGS="$XWINMODULES_CFLAGS $WINDOWSWM_CFLAGS"
++		AC_DEFINE(ROOTLESS,1,[Build Rootless code])
++	fi
++
+ 	case $host_os in
+ 		cygwin*)
+ 			XWIN_SERVER_NAME=XWin
+-			PKG_CHECK_MODULES([XWINMODULES],[x11 xdmcp xau xfont])
+ 			AC_DEFINE(HAS_DEVWINDOWS,1,[Cygwin has /dev/windows for signaling new win32 messages])
+-
+-			dnl if we have windowswmproto, build rootless extension for multwindowextwm mode
+-			if test "x$WINDOWSWM" = xyes ; then
+-			       AC_DEFINE(ROOTLESS,1,[Build Rootless code])
+-			fi
+ 			;;
+ 		mingw*)
+ 			XWIN_SERVER_NAME=Xming
+-			PKG_CHECK_MODULES([XWINMODULES],[x11 xdmcp xau xfont])
+ 			AC_DEFINE(RELOCATE_PROJECTROOT,1,[Make PROJECT_ROOT relative to the xserver location])
+ 			AC_DEFINE(HAS_WINSOCK,1,[Use Windows sockets])
+ 			XWIN_SYS_LIBS=-lwinsock2
+-- 
+1.7.0.4
+

Added: trunk/dports/x11/xorg-server-devel/files/0016-XQuartz-Blacklist-some-oddball-legacy-Mac-keycodes-t.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0016-XQuartz-Blacklist-some-oddball-legacy-Mac-keycodes-t.patch	                        (rev 0)
+++ trunk/dports/x11/xorg-server-devel/files/0016-XQuartz-Blacklist-some-oddball-legacy-Mac-keycodes-t.patch	2010-04-16 00:13:29 UTC (rev 66512)
@@ -0,0 +1,123 @@
+From 0e97ac0b3036aa500bee16aa1de22ee7c6cbd522 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu at apple.com>
+Date: Mon, 5 Apr 2010 16:54:22 -0700
+Subject: [PATCH 16/25] XQuartz: Blacklist some oddball legacy Mac keycodes that break wine
+
+http://xquartz.macosforge.org/trac/ticket/295
+
+Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
+(cherry picked from commit 1ac34213137cbcbdfcf4a07708e9af6ce0dbfb4a)
+---
+ hw/xquartz/quartzKeyboard.c |   61 +++++++++++++++++++++++++++++--------------
+ 1 files changed, 41 insertions(+), 20 deletions(-)
+
+diff --git xorg-server-1.8.0/hw/xquartz/quartzKeyboard.c xorg-server-1.8.0/hw/xquartz/quartzKeyboard.c
+index a4a0b08..db4df89 100644
+--- xorg-server-1.8.0/hw/xquartz/quartzKeyboard.c
++++ xorg-server-1.8.0/hw/xquartz/quartzKeyboard.c
+@@ -39,6 +39,7 @@
+ 
+ #define HACK_MISSING 1
+ #define HACK_KEYPAD 1
++#define HACK_BLACKLIST 1
+ 
+ #include <unistd.h>
+ #include <stdio.h>
+@@ -83,6 +84,7 @@ enum {
+ 
+ #define UKEYSYM(u) ((u) | 0x01000000)
+ 
++#if HACK_MISSING
+ /* Table of keycode->keysym mappings we use to fallback on for important
+    keys that are often not in the Unicode mapping. */
+ 
+@@ -117,7 +119,9 @@ const static struct {
+     {107, XK_F14},
+     {113, XK_F15},
+ };
++#endif
+ 
++#if HACK_KEYPAD
+ /* Table of keycode->old,new-keysym mappings we use to fixup the numeric
+    keypad entries. */
+ 
+@@ -143,6 +147,17 @@ const static struct {
+     {91, XK_8, XK_KP_8},
+     {92, XK_9, XK_KP_9},
+ };
++#endif
++
++#if HACK_BLACKLIST
++/* <rdar://problem/7824370> wine notepad produces wrong characters on shift+arrow
++ * http://xquartz.macosforge.org/trac/ticket/295
++ * http://developer.apple.com/legacy/mac/library/documentation/mac/Text/Text-579.html
++ *
++ * legacy Mac keycodes for arrow keys that shift-modify to math symbols
++ */
++const static unsigned short keycode_blacklist[] = {66, 70, 72, 77};
++#endif
+ 
+ /* Table mapping normal keysyms to their dead equivalents.
+    FIXME: all the unicode keysyms (apart from circumflex) were guessed. */
+@@ -772,32 +787,38 @@ Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
+         if (k[3] == k[2]) k[3] = NoSymbol;
+         if (k[1] == k[0]) k[1] = NoSymbol;
+         if (k[0] == k[2] && k[1] == k[3]) k[2] = k[3] = NoSymbol;
++        if (k[3] == k[0] && k[2] == k[1] && k[2] == NoSymbol) k[3] = NoSymbol;
+     }
+ 
++#if HACK_MISSING
+     /* Fix up some things that are normally missing.. */
+-
+-    if (HACK_MISSING) {
+-        for (i = 0; i < sizeof (known_keys) / sizeof (known_keys[0]); i++) {
+-            k = info->keyMap + known_keys[i].keycode * GLYPHS_PER_KEY;
+-
+-            if    (k[0] == NoSymbol && k[1] == NoSymbol
+-                && k[2] == NoSymbol && k[3] == NoSymbol)
+-	      k[0] = known_keys[i].keysym;
+-        }
++    
++    for (i = 0; i < sizeof (known_keys) / sizeof (known_keys[0]); i++) {
++        k = info->keyMap + known_keys[i].keycode * GLYPHS_PER_KEY;
++        
++        if (   k[0] == NoSymbol && k[1] == NoSymbol
++            && k[2] == NoSymbol && k[3] == NoSymbol)
++            k[0] = known_keys[i].keysym;
+     }
+-
++#endif
++    
++#if HACK_KEYPAD
+     /* And some more things. We find the right symbols for the numeric
+-       keypad, but not the KP_ keysyms. So try to convert known keycodes. */
+-
+-    if (HACK_KEYPAD) {
+-        for (i = 0; i < sizeof (known_numeric_keys)
+-                        / sizeof (known_numeric_keys[0]); i++) {
+-            k = info->keyMap + known_numeric_keys[i].keycode * GLYPHS_PER_KEY;
+-
+-            if (k[0] == known_numeric_keys[i].normal)
+-                k[0] = known_numeric_keys[i].keypad;
+-        }
++     keypad, but not the KP_ keysyms. So try to convert known keycodes. */
++    for (i = 0; i < sizeof (known_numeric_keys) / sizeof (known_numeric_keys[0]); i++) {
++        k = info->keyMap + known_numeric_keys[i].keycode * GLYPHS_PER_KEY;
++        
++        if (k[0] == known_numeric_keys[i].normal)
++            k[0] = known_numeric_keys[i].keypad;
+     }
++#endif
++    
++#if HACK_BLACKLIST
++    for (i = 0; i < sizeof (keycode_blacklist) / sizeof (keycode_blacklist[0]); i++) {
++        k = info->keyMap + keycode_blacklist[i] * GLYPHS_PER_KEY;
++        k[0] = k[1] = k[2] = k[3] = NoSymbol;
++    }
++#endif
+ 
+     DarwinBuildModifierMaps(info);
+ 
+-- 
+1.7.0.4
+

Added: trunk/dports/x11/xorg-server-devel/files/0017-XQuartz-Add-a-defaults-option-to-toggle-Alt-Mode_swi.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0017-XQuartz-Add-a-defaults-option-to-toggle-Alt-Mode_swi.patch	                        (rev 0)
+++ trunk/dports/x11/xorg-server-devel/files/0017-XQuartz-Add-a-defaults-option-to-toggle-Alt-Mode_swi.patch	2010-04-16 00:13:29 UTC (rev 66512)
@@ -0,0 +1,363 @@
+From de13a627f34ca5c882b6f2f84ba0d17b9044daeb Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu at apple.com>
+Date: Fri, 9 Apr 2010 13:29:34 -0700
+Subject: [PATCH 17/25] XQuartz: Add a defaults option to toggle Alt / Mode_switch
+
+See option_sends_alt in Xquartz(1)
+
+Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
+Reviewed-by: Kevin Van Vechten <kvv at apple.com>
+(cherry picked from commit 840d12c7a6ac6a974da185045215ce944a61fab6)
+---
+ hw/xquartz/X11Application.h    |    1 +
+ hw/xquartz/X11Application.m    |   19 +++-----
+ hw/xquartz/X11Controller.h     |    1 +
+ hw/xquartz/X11Controller.m     |  102 ++++++++++++++++++++++++----------------
+ hw/xquartz/doc/Xquartz.man.pre |    3 +
+ hw/xquartz/quartz.c            |    1 +
+ hw/xquartz/quartzCommon.h      |    1 +
+ hw/xquartz/quartzKeyboard.c    |   30 +++++++++++-
+ hw/xquartz/quartzKeyboard.h    |   10 +----
+ 9 files changed, 104 insertions(+), 64 deletions(-)
+
+diff --git xorg-server-1.8.0/hw/xquartz/X11Application.h xorg-server-1.8.0/hw/xquartz/X11Application.h
+index d7e9a5f..ce19e03 100644
+--- xorg-server-1.8.0/hw/xquartz/X11Application.h
++++ xorg-server-1.8.0/hw/xquartz/X11Application.h
+@@ -90,6 +90,7 @@ extern int quartzHasRoot, quartzEnableRootless, quartzFullscreenMenu;
+ #define PREFS_NO_TCP                "nolisten_tcp"
+ #define PREFS_DONE_XINIT_CHECK      "done_xinit_check"
+ #define PREFS_NO_QUIT_ALERT         "no_quit_alert"
++#define PREFS_OPTION_SENDS_ALT      "option_sends_alt"
+ #define PREFS_FAKE_BUTTON2          "fake_button2"
+ #define PREFS_FAKE_BUTTON3          "fake_button3"
+ #define PREFS_APPKIT_MODIFIERS      "appkit_modifiers"
+diff --git xorg-server-1.8.0/hw/xquartz/X11Application.m xorg-server-1.8.0/hw/xquartz/X11Application.m
+index 5406640..c9a0d66 100644
+--- xorg-server-1.8.0/hw/xquartz/X11Application.m
++++ xorg-server-1.8.0/hw/xquartz/X11Application.m
+@@ -712,10 +712,13 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
+                                            default:quartzEnableRootless];
+     quartzFullscreenMenu = [self prefs_get_boolean:@PREFS_FULLSCREEN_MENU
+                                            default:quartzFullscreenMenu];
+-    quartzFullscreenDisableHotkeys = ![self prefs_get_boolean:
+-                            @PREFS_FULLSCREEN_HOTKEYS default:!quartzFullscreenDisableHotkeys];
++    quartzFullscreenDisableHotkeys = ![self prefs_get_boolean:@PREFS_FULLSCREEN_HOTKEYS
++                                                      default:!quartzFullscreenDisableHotkeys];
+     darwinFakeButtons = [self prefs_get_boolean:@PREFS_FAKEBUTTONS
+                                         default:darwinFakeButtons];
++    quartzOptionSendsAlt = [self prefs_get_boolean:@PREFS_OPTION_SENDS_ALT
++                                           default:quartzOptionSendsAlt];
++
+     if (darwinFakeButtons) {
+         const char *fake2, *fake3;
+ 
+@@ -969,8 +972,7 @@ void X11ApplicationMain (int argc, char **argv, char **envp) {
+         fprintf(stderr, "X11ApplicationMain: Unable to determine KLGetCurrentKeyboardLayout() at startup.\n");
+ #endif
+ 
+-    memset(keyInfo.keyMap, 0, sizeof(keyInfo.keyMap));
+-    if (!QuartzReadSystemKeymap(&keyInfo)) {
++    if (!QuartsResyncKeymap(FALSE)) {
+         fprintf(stderr, "X11ApplicationMain: Could not build a valid keymap.\n");
+     }
+ 
+@@ -1229,17 +1231,10 @@ static inline int ensure_flag(int flags, int device_independent, int device_depe
+                 if(key_layout != last_key_layout) {
+                     last_key_layout = key_layout;
+ #endif
+-
+                     /* Update keyInfo */
+-                    pthread_mutex_lock(&keyInfo_mutex);
+-                    memset(keyInfo.keyMap, 0, sizeof(keyInfo.keyMap));
+-                    if (!QuartzReadSystemKeymap(&keyInfo)) {
++                    if (!QuartsResyncKeymap(TRUE)) {
+                         fprintf(stderr, "sendX11NSEvent: Could not build a valid keymap.\n");
+                     }
+-                    pthread_mutex_unlock(&keyInfo_mutex);
+-                    
+-                    /* Tell server thread to deal with new keyInfo */
+-                    DarwinSendDDXEvent(kXquartzReloadKeymap, 0);
+                 }
+             }
+ 
+diff --git xorg-server-1.8.0/hw/xquartz/X11Controller.h xorg-server-1.8.0/hw/xquartz/X11Controller.h
+index 9e16f75..a2024df 100644
+--- xorg-server-1.8.0/hw/xquartz/X11Controller.h
++++ xorg-server-1.8.0/hw/xquartz/X11Controller.h
+@@ -69,6 +69,7 @@ typedef unsigned int NSUInteger;
+     IBOutlet NSButton *use_sysbeep;
+     IBOutlet NSButton *enable_keyequivs;
+     IBOutlet NSButton *sync_keymap;
++    IBOutlet NSButton *option_sends_alt;
+     IBOutlet NSButton *click_through;
+     IBOutlet NSButton *focus_follows_mouse;
+     IBOutlet NSButton *focus_on_new_window;
+diff --git xorg-server-1.8.0/hw/xquartz/X11Controller.m xorg-server-1.8.0/hw/xquartz/X11Controller.m
+index b28f4d3..d66d039 100644
+--- xorg-server-1.8.0/hw/xquartz/X11Controller.m
++++ xorg-server-1.8.0/hw/xquartz/X11Controller.m
+@@ -43,6 +43,7 @@
+ #include "darwin.h"
+ #include "darwinEvents.h"
+ #include "quartz.h"
++#include "quartzKeyboard.h"
+ #include <X11/extensions/applewmconst.h>
+ #include "applewmExt.h"
+ 
+@@ -630,49 +631,69 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row
+ 
+ - (IBAction)prefs_changed:sender
+ {
+-    BOOL pbproxy_active;
+-
+-    darwinFakeButtons = [fake_buttons intValue];
+-    quartzUseSysBeep = [use_sysbeep intValue];
+-    X11EnableKeyEquivalents = [enable_keyequivs intValue];
+-    darwinSyncKeymap = [sync_keymap intValue];
+-    quartzFullscreenMenu = [enable_fullscreen_menu intValue];
+-
+-    /* after adding prefs here, also add to [X11Application read_defaults]
+-     and prefs_show */
+-
+-    [NSApp prefs_set_boolean:@PREFS_FAKEBUTTONS value:darwinFakeButtons];
+-    [NSApp prefs_set_boolean:@PREFS_SYSBEEP value:quartzUseSysBeep];
+-    [NSApp prefs_set_boolean:@PREFS_KEYEQUIVS value:X11EnableKeyEquivalents];
+-    [NSApp prefs_set_boolean:@PREFS_SYNC_KEYMAP value:darwinSyncKeymap];
+-    [NSApp prefs_set_boolean:@PREFS_FULLSCREEN_MENU value:quartzFullscreenMenu];
+-    [NSApp prefs_set_boolean:@PREFS_CLICK_THROUGH value:[click_through intValue]];
+-    [NSApp prefs_set_boolean:@PREFS_FFM value:[focus_follows_mouse intValue]];
+-    [NSApp prefs_set_boolean:@PREFS_FOCUS_ON_NEW_WINDOW value:[focus_on_new_window intValue]];
+-    [NSApp prefs_set_boolean:@PREFS_NO_AUTH value:![enable_auth intValue]];
+-    [NSApp prefs_set_boolean:@PREFS_NO_TCP value:![enable_tcp intValue]];
+-    [NSApp prefs_set_integer:@PREFS_DEPTH value:[depth selectedTag]];
+-
+-    pbproxy_active = [sync_pasteboard intValue];
+-
+-    [NSApp prefs_set_boolean:@PREFS_SYNC_PB value:pbproxy_active];
+-    [NSApp prefs_set_boolean:@PREFS_SYNC_PB_TO_CLIPBOARD value:[sync_pasteboard_to_clipboard intValue]];
+-    [NSApp prefs_set_boolean:@PREFS_SYNC_PB_TO_PRIMARY value:[sync_pasteboard_to_primary intValue]];
+-    [NSApp prefs_set_boolean:@PREFS_SYNC_CLIPBOARD_TO_PB value:[sync_clipboard_to_pasteboard intValue]];
+-    [NSApp prefs_set_boolean:@PREFS_SYNC_PRIMARY_ON_SELECT value:[sync_primary_immediately intValue]];
++    if(!sender)
++        return;
++    
++    if(sender == fake_buttons) {
++        darwinFakeButtons = [fake_buttons intValue];
++        [NSApp prefs_set_boolean:@PREFS_FAKEBUTTONS value:darwinFakeButtons];
++    } else if(sender == use_sysbeep) {
++        quartzUseSysBeep = [use_sysbeep intValue];
++        [NSApp prefs_set_boolean:@PREFS_SYSBEEP value:quartzUseSysBeep];
++    } else if(sender == enable_keyequivs) {
++        X11EnableKeyEquivalents =  [enable_keyequivs intValue];
++        [NSApp prefs_set_boolean:@PREFS_KEYEQUIVS value:X11EnableKeyEquivalents];
++    } else if(sender == sync_keymap) {
++        darwinSyncKeymap = [sync_keymap intValue];
++        [NSApp prefs_set_boolean:@PREFS_SYNC_KEYMAP value:darwinSyncKeymap];
++    } else if(sender == enable_fullscreen_menu) {
++        quartzFullscreenMenu = [enable_fullscreen_menu intValue];
++        [NSApp prefs_set_boolean:@PREFS_FULLSCREEN_MENU value:quartzFullscreenMenu];
++    } else if(sender == option_sends_alt) {
++        BOOL prev_opt_sends_alt = quartzOptionSendsAlt;
++        
++        quartzOptionSendsAlt = [option_sends_alt intValue];
++        [NSApp prefs_set_boolean:@PREFS_OPTION_SENDS_ALT value:quartzOptionSendsAlt];
++
++        if(prev_opt_sends_alt != quartzOptionSendsAlt)
++            QuartsResyncKeymap(TRUE);
++    } else if(sender == click_through) {
++        [NSApp prefs_set_boolean:@PREFS_CLICK_THROUGH value:[click_through intValue]];
++    } else if(sender == focus_follows_mouse) {
++        [NSApp prefs_set_boolean:@PREFS_FFM value:[focus_follows_mouse intValue]];
++    } else if(sender == focus_on_new_window) {
++        [NSApp prefs_set_boolean:@PREFS_FOCUS_ON_NEW_WINDOW value:[focus_on_new_window intValue]];
++    } else if(sender == enable_auth) {
++        [NSApp prefs_set_boolean:@PREFS_NO_AUTH value:![enable_auth intValue]];
++    } else if(sender == enable_tcp) {
++        [NSApp prefs_set_boolean:@PREFS_NO_TCP value:![enable_tcp intValue]];
++    } else if(sender == depth) {
++        [NSApp prefs_set_integer:@PREFS_DEPTH value:[depth selectedTag]];
++    } else if(sender == sync_pasteboard) {
++        BOOL pbproxy_active = [sync_pasteboard intValue];
++        [NSApp prefs_set_boolean:@PREFS_SYNC_PB value:pbproxy_active];
++
++        [sync_pasteboard_to_clipboard setEnabled:pbproxy_active];
++        [sync_pasteboard_to_primary setEnabled:pbproxy_active];
++        [sync_clipboard_to_pasteboard setEnabled:pbproxy_active];
++        [sync_primary_immediately setEnabled:pbproxy_active];
++
++        // setEnabled doesn't do this...
++        [sync_text1 setTextColor:pbproxy_active ? [NSColor controlTextColor] : [NSColor disabledControlTextColor]];
++        [sync_text2 setTextColor:pbproxy_active ? [NSColor controlTextColor] : [NSColor disabledControlTextColor]];
++    } else if(sender == sync_pasteboard_to_clipboard) {
++        [NSApp prefs_set_boolean:@PREFS_SYNC_PB_TO_CLIPBOARD value:[sync_pasteboard_to_clipboard intValue]];
++    } else if(sender == sync_pasteboard_to_primary) {
++        [NSApp prefs_set_boolean:@PREFS_SYNC_PB_TO_PRIMARY value:[sync_pasteboard_to_primary intValue]];
++    } else if(sender == sync_clipboard_to_pasteboard) {
++        [NSApp prefs_set_boolean:@PREFS_SYNC_CLIPBOARD_TO_PB value:[sync_clipboard_to_pasteboard intValue]];
++    } else if(sender == sync_primary_immediately) {
++        [NSApp prefs_set_boolean:@PREFS_SYNC_PRIMARY_ON_SELECT value:[sync_primary_immediately intValue]];
++    }
+ 
+     [NSApp prefs_synchronize];
+-
+-    [sync_pasteboard_to_clipboard setEnabled:pbproxy_active];
+-    [sync_pasteboard_to_primary setEnabled:pbproxy_active];
+-    [sync_clipboard_to_pasteboard setEnabled:pbproxy_active];
+-    [sync_primary_immediately setEnabled:pbproxy_active];
+-    
+-    // setEnabled doesn't do this...
+-    [sync_text1 setTextColor:pbproxy_active ? [NSColor controlTextColor] : [NSColor disabledControlTextColor]];
+-    [sync_text2 setTextColor:pbproxy_active ? [NSColor controlTextColor] : [NSColor disabledControlTextColor]];
+     
+-	DarwinSendDDXEvent(kXquartzReloadPreferences, 0);
++    DarwinSendDDXEvent(kXquartzReloadPreferences, 0);
+ }
+ 
+ - (IBAction) prefs_show:sender
+@@ -683,6 +704,7 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row
+     [use_sysbeep setIntValue:quartzUseSysBeep];
+     [enable_keyequivs setIntValue:X11EnableKeyEquivalents];
+     [sync_keymap setIntValue:darwinSyncKeymap];
++    [option_sends_alt setIntValue:quartzOptionSendsAlt];
+     [click_through setIntValue:[NSApp prefs_get_boolean:@PREFS_CLICK_THROUGH default:NO]];
+     [focus_follows_mouse setIntValue:[NSApp prefs_get_boolean:@PREFS_FFM default:NO]];
+     [focus_on_new_window setIntValue:[NSApp prefs_get_boolean:@PREFS_FOCUS_ON_NEW_WINDOW default:YES]];
+diff --git xorg-server-1.8.0/hw/xquartz/doc/Xquartz.man.pre xorg-server-1.8.0/hw/xquartz/doc/Xquartz.man.pre
+index 04bbee3..e54be96 100644
+--- xorg-server-1.8.0/hw/xquartz/doc/Xquartz.man.pre
++++ xorg-server-1.8.0/hw/xquartz/doc/Xquartz.man.pre
+@@ -63,6 +63,9 @@ defaults to the depth of the main display.
+ .B defaults write org.x.X11 sync_keymap -boolean true
+ Keep the X11 keymap up to date with the OSX system keymap.
+ .TP 8
++.B defaults write org.x.X11 option_sends_alt -boolean true
++The Option key will send Alt_L and Alt_R instead of Mode_switch.
++.TP 8
+ .B defaults write org.x.X11 sync_pasteboard -boolean true
+ Enable syncing between the OSX pasteboard and clipboard/primary selection buffers in X11.  This option needs to be true for any of the other pasteboard sync options to have an effect.
+ .TP 8
+diff --git xorg-server-1.8.0/hw/xquartz/quartz.c xorg-server-1.8.0/hw/xquartz/quartz.c
+index a611854..a8c0d4b 100644
+--- xorg-server-1.8.0/hw/xquartz/quartz.c
++++ xorg-server-1.8.0/hw/xquartz/quartz.c
+@@ -79,6 +79,7 @@ int                     aquaMenuBarHeight = 0;
+ QuartzModeProcsPtr      quartzProcs = NULL;
+ const char             *quartzOpenGLBundle = NULL;
+ int                     quartzFullscreenDisableHotkeys = TRUE;
++int                     quartzOptionSendsAlt = FALSE;
+ 
+ #if defined(RANDR) && !defined(FAKE_RANDR)
+ Bool QuartzRandRGetInfo (ScreenPtr pScreen, Rotation *rotations) {
+diff --git xorg-server-1.8.0/hw/xquartz/quartzCommon.h xorg-server-1.8.0/hw/xquartz/quartzCommon.h
+index 1c0eeba..8ab70f2 100644
+--- xorg-server-1.8.0/hw/xquartz/quartzCommon.h
++++ xorg-server-1.8.0/hw/xquartz/quartzCommon.h
+@@ -60,6 +60,7 @@ extern int              focusOnNewWindow;
+ extern int              quartzUseAGL;
+ extern int              quartzEnableKeyEquivalents;
+ extern int              quartzFullscreenDisableHotkeys;
++extern int              quartzOptionSendsAlt;
+ 
+ // Other shared data
+ extern int              quartzServerVisible;
+diff --git xorg-server-1.8.0/hw/xquartz/quartzKeyboard.c xorg-server-1.8.0/hw/xquartz/quartzKeyboard.c
+index db4df89..745333f 100644
+--- xorg-server-1.8.0/hw/xquartz/quartzKeyboard.c
++++ xorg-server-1.8.0/hw/xquartz/quartzKeyboard.c
+@@ -50,6 +50,7 @@
+ 
+ #include "quartzCommon.h"
+ #include "darwin.h"
++#include "darwinEvents.h"
+ 
+ #include "quartzKeyboard.h"
+ #include "quartzAudio.h"
+@@ -191,6 +192,12 @@ const static struct {
+     {UKEYSYM (0x31b), XK_dead_horn},		/* COMBINING HORN */
+ };
+ 
++typedef struct darwinKeyboardInfo_struct {
++    CARD8 modMap[MAP_LENGTH];
++    KeySym keyMap[MAP_LENGTH * GLYPHS_PER_KEY];
++    unsigned char modifierKeycodes[32][2];
++} darwinKeyboardInfo;
++
+ darwinKeyboardInfo keyInfo;
+ pthread_mutex_t keyInfo_mutex = PTHREAD_MUTEX_INITIALIZER;
+ 
+@@ -255,7 +262,8 @@ static void DarwinBuildModifierMaps(darwinKeyboardInfo *info) {
+             case XK_Alt_L:
+                 info->modifierKeycodes[NX_MODIFIERKEY_ALTERNATE][0] = i;
+                 info->modMap[MIN_KEYCODE + i] = Mod1Mask;
+-                *k = XK_Mode_switch; // Yes, this is ugly.  This needs to be cleaned up when we integrate quartzKeyboard with this code and refactor.
++                if(!quartzOptionSendsAlt)
++                    *k = XK_Mode_switch; // Yes, this is ugly.  This needs to be cleaned up when we integrate quartzKeyboard with this code and refactor.
+                 break;
+ 
+             case XK_Alt_R:
+@@ -264,7 +272,8 @@ static void DarwinBuildModifierMaps(darwinKeyboardInfo *info) {
+ #else
+                 info->modifierKeycodes[NX_MODIFIERKEY_ALTERNATE][0] = i;
+ #endif
+-                *k = XK_Mode_switch; // Yes, this is ugly.  This needs to be cleaned up when we integrate quartzKeyboard with this code and refactor.
++                if(!quartzOptionSendsAlt)
++                    *k = XK_Mode_switch; // Yes, this is ugly.  This needs to be cleaned up when we integrate quartzKeyboard with this code and refactor.
+                 info->modMap[MIN_KEYCODE + i] = Mod1Mask;
+                 break;
+ 
+@@ -647,7 +656,7 @@ static KeySym make_dead_key(KeySym in) {
+     return in;
+ }
+ 
+-Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
++static Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
+ #if !defined(__LP64__) || MAC_OS_X_VERSION_MIN_REQUIRED < 1050
+     KeyboardLayoutRef key_layout;
+     int is_uchr = 1;
+@@ -824,3 +833,18 @@ Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
+ 
+     return TRUE;
+ }
++
++Bool QuartsResyncKeymap(Bool sendDDXEvent) {
++    Bool retval;
++    /* Update keyInfo */
++    pthread_mutex_lock(&keyInfo_mutex);
++    memset(keyInfo.keyMap, 0, sizeof(keyInfo.keyMap));
++    retval = QuartzReadSystemKeymap(&keyInfo);
++    pthread_mutex_unlock(&keyInfo_mutex);
++
++    /* Tell server thread to deal with new keyInfo */
++    if(sendDDXEvent)
++        DarwinSendDDXEvent(kXquartzReloadKeymap, 0);
++
++    return retval;
++}
+diff --git xorg-server-1.8.0/hw/xquartz/quartzKeyboard.h xorg-server-1.8.0/hw/xquartz/quartzKeyboard.h
+index 1aaec6e..1151a00 100644
+--- xorg-server-1.8.0/hw/xquartz/quartzKeyboard.h
++++ xorg-server-1.8.0/hw/xquartz/quartzKeyboard.h
+@@ -41,18 +41,10 @@
+ #define MIN_KEYCODE     XkbMinLegalKeyCode     // unfortunately, this isn't 0...
+ #define MAX_KEYCODE     NUM_KEYCODES + MIN_KEYCODE - 1
+ 
+-typedef struct darwinKeyboardInfo_struct {
+-    CARD8 modMap[MAP_LENGTH];
+-    KeySym keyMap[MAP_LENGTH * GLYPHS_PER_KEY];
+-    unsigned char modifierKeycodes[32][2];
+-} darwinKeyboardInfo;
+-
+ /* These functions need to be implemented by Xquartz, XDarwin, etc. */
+-Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info);
++Bool QuartsResyncKeymap(Bool sendDDXEvent);
+ 
+ /* Provided for darwinEvents.c */
+-extern darwinKeyboardInfo keyInfo;
+-extern pthread_mutex_t keyInfo_mutex;
+ void DarwinKeyboardReloadHandler(void);
+ int DarwinModifierNXKeycodeToNXKey(unsigned char keycode, int *outSide);
+ int DarwinModifierNXKeyToNXKeycode(int key, int side);
+-- 
+1.7.0.4
+

Added: trunk/dports/x11/xorg-server-devel/files/0018-XQuartz-Customize-the-NSDefaults-id-in-the-man-file.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0018-XQuartz-Customize-the-NSDefaults-id-in-the-man-file.patch	                        (rev 0)
+++ trunk/dports/x11/xorg-server-devel/files/0018-XQuartz-Customize-the-NSDefaults-id-in-the-man-file.patch	2010-04-16 00:13:29 UTC (rev 66512)
@@ -0,0 +1,125 @@
+From f20f1d57a514fe4b767b383c5369f1f79f2b1262 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu at apple.com>
+Date: Fri, 9 Apr 2010 13:33:06 -0700
+Subject: [PATCH 18/25] XQuartz: Customize the NSDefaults id in the man file.
+
+Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
+Reviewed-by: Kevin Van Vechten <kvv at apple.com>
+(cherry picked from commit 5600f7f001529b3afdee95546aec212a70d6a5b2)
+---
+ hw/xquartz/doc/Makefile.am     |    2 ++
+ hw/xquartz/doc/Xquartz.man.pre |   38 +++++++++++++++++++-------------------
+ 2 files changed, 21 insertions(+), 19 deletions(-)
+
+diff --git xorg-server-1.8.0/hw/xquartz/doc/Makefile.am xorg-server-1.8.0/hw/xquartz/doc/Makefile.am
+index 7310de3..6c68c84 100644
+--- xorg-server-1.8.0/hw/xquartz/doc/Makefile.am
++++ xorg-server-1.8.0/hw/xquartz/doc/Makefile.am
+@@ -7,6 +7,8 @@ CLEANFILES = $(appman_PROCESSED) $(appman_DATA)
+ 
+ include $(top_srcdir)/cpprules.in
+ 
++MANDEFS += -D__laucnd_id_prefix__=$(LAUNCHD_ID_PREFIX)
++
+ .man.$(APP_MAN_SUFFIX):
+ 	$(AM_V_at)cp $< $@
+ 
+diff --git xorg-server-1.8.0/hw/xquartz/doc/Xquartz.man.pre xorg-server-1.8.0/hw/xquartz/doc/Xquartz.man.pre
+index e54be96..4471947 100644
+--- xorg-server-1.8.0/hw/xquartz/doc/Xquartz.man.pre
++++ xorg-server-1.8.0/hw/xquartz/doc/Xquartz.man.pre
+@@ -16,72 +16,72 @@ OS X handles the desktop background.
+ .SH CUSTOMIZATION
+ \fIXquartz\fP can be customized using the defaults(1) command. The available options are:
+ .TP 8
+-.B defaults write org.x.X11 enable_fake_buttons -boolean true
++.B defaults write __laucnd_id_prefix__.X11 enable_fake_buttons -boolean true
+ Emulates a 3 button mouse using modifier keys. By default, the Command modifier
+ is used to emulate button 2 and Option is used for button 3. Thus, clicking the
+ first mouse button while holding down Command will act like clicking
+ button 2. Holding down Option will simulate button 3.
+ .TP 8
+-.B defaults write org.x.X11 fake_button2 \fImodifiers\fP
++.B defaults write __laucnd_id_prefix__.X11 fake_button2 \fImodifiers\fP
+ Change the modifier keys used to emulate the second mouse button. By default,
+ Command is used to emulate the second button. Any combination of the following
+ modifier names may be used: {l,r,}shift, {l,r,}option, {l,r,}control, {l,r,}command, fn
+ .TP 8
+-.B defaults write org.x.X11 fake_button3 \fImodifiers\fP
++.B defaults write __laucnd_id_prefix__.X11 fake_button3 \fImodifiers\fP
+ Change the modifier keys used to emulate the second mouse button. By default,
+ Command is used to emulate the second button. Any combination of the following
+ modifier names may be used: {l,r,}shift, {l,r,}option, {l,r,}control, {l,r,}command, fn
+ .TP 8
+-.B defaults write org.x.X11 fullscreen_hotkeys -boolean true
++.B defaults write __laucnd_id_prefix__.X11 fullscreen_hotkeys -boolean true
+ Enable OSX hotkeys while in fullscreen
+ .TP 8
+-.B defaults write org.x.X11 fullscreen_menu -boolean true
++.B defaults write __laucnd_id_prefix__.X11 fullscreen_menu -boolean true
+ Show the OSX menu while in fullscreen
+ .TP 8
+-.B defaults write org.x.X11 no_quit_alert -boolean true
++.B defaults write __laucnd_id_prefix__.X11 no_quit_alert -boolean true
+ Disables the alert dialog displayed when attempting to quit X11.
+ .TP 8
+-.B defaults write org.x.X11 no_auth -boolean true
++.B defaults write __laucnd_id_prefix__.X11 no_auth -boolean true
+ Stops the X server requiring that clients authenticate themselves when
+ connecting.  See Xsecurity(__miscmansuffix__).
+ .TP 8
+-.B defaults write org.x.X11 nolisten_tcp -boolean false
++.B defaults write __laucnd_id_prefix__.X11 nolisten_tcp -boolean false
+ This will tell the server to listen and accept TCP connections.  Doing this without enabling
+ xauth is a possible security concern.  See Xsecurity(__miscmansuffix__).
+ .TP 8
+-.B defaults write org.x.X11 enable_system_beep -boolean false
++.B defaults write __laucnd_id_prefix__.X11 enable_system_beep -boolean false
+ Don't use the standard system beep effect for X11 alerts.
+ .TP 8
+-.B defaults write org.x.X11 enable_key_equivalents -boolean false
++.B defaults write __laucnd_id_prefix__.X11 enable_key_equivalents -boolean false
+ Disable menu keyboard equivalents while X11 windows are focused.
+ .TP 8
+-.B defaults write org.x.X11 depth \fIdepth\fP
++.B defaults write __laucnd_id_prefix__.X11 depth \fIdepth\fP
+ Specifies the color bit depth to use. Currently only 15, and 24 color
+ bits per pixel are supported. If not specified, or a value of -1 is specified,
+ defaults to the depth of the main display.
+ .TP 8
+-.B defaults write org.x.X11 sync_keymap -boolean true
++.B defaults write __laucnd_id_prefix__.X11 sync_keymap -boolean true
+ Keep the X11 keymap up to date with the OSX system keymap.
+ .TP 8
+-.B defaults write org.x.X11 option_sends_alt -boolean true
++.B defaults write __laucnd_id_prefix__.X11 option_sends_alt -boolean true
+ The Option key will send Alt_L and Alt_R instead of Mode_switch.
+ .TP 8
+-.B defaults write org.x.X11 sync_pasteboard -boolean true
++.B defaults write __laucnd_id_prefix__.X11 sync_pasteboard -boolean true
+ Enable syncing between the OSX pasteboard and clipboard/primary selection buffers in X11.  This option needs to be true for any of the other pasteboard sync options to have an effect.
+ .TP 8
+-.B defaults write org.x.X11 sync_pasteboard_to_clipboard -boolean true
++.B defaults write __laucnd_id_prefix__.X11 sync_pasteboard_to_clipboard -boolean true
+ Update the X11 CLIPBOARD when the OSX NSPasteboard is updated.
+ .TP 8
+-.B defaults write org.x.X11 sync_pasteboard_to_primary -boolean true
++.B defaults write __laucnd_id_prefix__.X11 sync_pasteboard_to_primary -boolean true
+ Update the the X11 PRIMARY buffer when the OSX NSPasteboard is updated.
+ .TP 8
+-.B defaults write org.x.X11 sync_clipboard_to_pasteboard -boolean true
++.B defaults write __laucnd_id_prefix__.X11 sync_clipboard_to_pasteboard -boolean true
+ Update the the OSX NSPasteboard when the X11 CLIPBOARD is updated.  Note that enabling this option causes the clipboard synchronization to act as a clipboard manager in X11.  This makes it impossible to use xclipboard, klipper, or any other such clipboard managers.  If you want to use any of these programs, you must disable this option.
+ .TP 8
+-.B defaults write org.x.X11 sync_primary_on_select -boolean true
++.B defaults write __laucnd_id_prefix__.X11 sync_primary_on_select -boolean true
+ This option defaults to false and is provided only "for experts."  It updates the NSPasteboard whenever a new X11 selection is made (rather than requiring you to hit cmd-c to copy the selection to the NSPasteboard).  Since the X11 protocol does not require applications to send notification when they change selection, this might not work in all cases (if you run into this problem, try selecting text in another application first, then selecting the text you want).
+ .TP 8
+-.B defaults write org.x.X11 enable_test_extensions -boolean true
++.B defaults write __laucnd_id_prefix__.X11 enable_test_extensions -boolean true
+ This option defaults to false and is only accessible through the command line.  Enable this option to turn on the DEC-XTRAP, RECORD, and XTEST extensions in the server.
+ .SH OPTIONS
+ .PP
+-- 
+1.7.0.4
+

Added: trunk/dports/x11/xorg-server-devel/files/0019-XQuartz-Add-a-GUI-preference-for-the-Alt-Mode_switch.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0019-XQuartz-Add-a-GUI-preference-for-the-Alt-Mode_switch.patch	                        (rev 0)
+++ trunk/dports/x11/xorg-server-devel/files/0019-XQuartz-Add-a-GUI-preference-for-the-Alt-Mode_switch.patch	2010-04-16 00:13:29 UTC (rev 66512)
@@ -0,0 +1,3892 @@
+From 88f275a748766422a9a56dcdb692970afc56c59c Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu at apple.com>
+Date: Fri, 9 Apr 2010 16:19:43 -0700
+Subject: [PATCH 19/25] XQuartz: Add a GUI preference for the Alt / Mode_switch toggle
+
+Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
+Reviewed-by: Kevin Van Vechten <kvv at apple.com>
+(cherry picked from commit 59edde7c28db2d3174a5813a0af334e4ead2082f)
+---
+ hw/xquartz/X11Controller.h                         |    5 +-
+ .../English.lproj/main.nib/designable.nib          | 1791 ++++++++------------
+ .../English.lproj/main.nib/keyedobjects.nib        |  Bin 41440 -> 45258 bytes
+ 3 files changed, 712 insertions(+), 1084 deletions(-)
+
+diff --git xorg-server-1.8.0/hw/xquartz/X11Controller.h xorg-server-1.8.0/hw/xquartz/X11Controller.h
+index a2024df..65a09b8 100644
+--- xorg-server-1.8.0/hw/xquartz/X11Controller.h
++++ xorg-server-1.8.0/hw/xquartz/X11Controller.h
+@@ -55,10 +55,9 @@ typedef unsigned int NSUInteger;
+ #endif
+ #endif
+ 
+-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
+- at interface X11Controller : NSObject <NSTableViewDataSource>
+-#else
+ @interface X11Controller : NSObject
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
++<NSTableViewDataSource>
+ #endif
+ {
+     IBOutlet NSPanel *prefs_panel;
+diff --git xorg-server-1.8.0/hw/xquartz/bundle/Resources/English.lproj/main.nib/designable.nib xorg-server-1.8.0/hw/xquartz/bundle/Resources/English.lproj/main.nib/designable.nib
+index 94d0104..7609393 100644
+--- xorg-server-1.8.0/hw/xquartz/bundle/Resources/English.lproj/main.nib/designable.nib
++++ xorg-server-1.8.0/hw/xquartz/bundle/Resources/English.lproj/main.nib/designable.nib
+@@ -1,29 +1,21 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03">
++<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
+ 	<data>
+-		<int key="IBDocument.SystemTarget">1050</int>
+-		<string key="IBDocument.SystemVersion">9L29</string>
+-		<string key="IBDocument.InterfaceBuilderVersion">677</string>
+-		<string key="IBDocument.AppKitVersion">949.54</string>
+-		<string key="IBDocument.HIToolboxVersion">353.00</string>
+-		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+-			<bool key="EncodedWithXMLCoder">YES</bool>
++		<int key="IBDocument.SystemTarget">1040</int>
++		<string key="IBDocument.SystemVersion">10D573</string>
++		<string key="IBDocument.InterfaceBuilderVersion">761</string>
++		<string key="IBDocument.AppKitVersion">1038.29</string>
++		<string key="IBDocument.HIToolboxVersion">460.00</string>
++		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
++			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
++			<string key="NS.object.0">761</string>
+ 		</object>
+-		<object class="NSArray" key="IBDocument.PluginDependencies">
+-			<bool key="EncodedWithXMLCoder">YES</bool>
++		<array class="NSMutableArray" key="IBDocument.EditedObjectIDs"/>
++		<array key="IBDocument.PluginDependencies">
+ 			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-		</object>
+-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+-			<bool key="EncodedWithXMLCoder">YES</bool>
+-			<object class="NSArray" key="dict.sortedKeys">
+-				<bool key="EncodedWithXMLCoder">YES</bool>
+-			</object>
+-			<object class="NSMutableArray" key="dict.values">
+-				<bool key="EncodedWithXMLCoder">YES</bool>
+-			</object>
+-		</object>
+-		<object class="NSMutableArray" key="IBDocument.RootObjects" id="904585544">
+-			<bool key="EncodedWithXMLCoder">YES</bool>
++		</array>
++		<dictionary class="NSMutableDictionary" key="IBDocument.Metadata"/>
++		<array class="NSMutableArray" key="IBDocument.RootObjects" id="904585544">
+ 			<object class="NSCustomObject" id="815810918">
+ 				<object class="NSMutableString" key="NSClassName">
+ 					<characters key="NS.bytes">NSApplication</characters>
+@@ -37,8 +29,7 @@
+ 			</object>
+ 			<object class="NSMenu" id="524015605">
+ 				<string key="NSTitle">MainMenu</string>
+-				<object class="NSMutableArray" key="NSMenuItems">
+-					<bool key="EncodedWithXMLCoder">YES</bool>
++				<array class="NSMutableArray" key="NSMenuItems">
+ 					<object class="NSMenuItem" id="365880285">
+ 						<reference key="NSMenu" ref="524015605"/>
+ 						<string key="NSTitle">X11</string>
+@@ -56,8 +47,7 @@
+ 						<string key="NSAction">submenuAction:</string>
+ 						<object class="NSMenu" key="NSSubmenu" id="576521955">
+ 							<string key="NSTitle">X11</string>
+-							<object class="NSMutableArray" key="NSMenuItems">
+-								<bool key="EncodedWithXMLCoder">YES</bool>
++							<array class="NSMutableArray" key="NSMenuItems">
+ 								<object class="NSMenuItem" id="139290918">
+ 									<reference key="NSMenu" ref="576521955"/>
+ 									<string key="NSTitle">About X11</string>
+@@ -99,9 +89,7 @@
+ 										<object class="NSMutableString" key="NSTitle">
+ 											<characters key="NS.bytes">Services</characters>
+ 										</object>
+-										<object class="NSMutableArray" key="NSMenuItems">
+-											<bool key="EncodedWithXMLCoder">YES</bool>
+-										</object>
++										<array class="NSMutableArray" key="NSMenuItems"/>
+ 										<string key="NSName">_NSServicesMenu</string>
+ 									</object>
+ 								</object>
+@@ -185,7 +173,7 @@
+ 									<reference key="NSOnImage" ref="531645050"/>
+ 									<reference key="NSMixedImage" ref="351811234"/>
+ 								</object>
+-							</object>
++							</array>
+ 							<string key="NSName">_NSAppleMenu</string>
+ 						</object>
+ 					</object>
+@@ -200,8 +188,7 @@
+ 						<string key="NSAction">submenuAction:</string>
+ 						<object class="NSMenu" key="NSSubmenu" id="981161348">
+ 							<string key="NSTitle">Applications</string>
+-							<object class="NSMutableArray" key="NSMenuItems">
+-								<bool key="EncodedWithXMLCoder">YES</bool>
++							<array class="NSMutableArray" key="NSMenuItems">
+ 								<object class="NSMenuItem" id="390088328">
+ 									<reference key="NSMenu" ref="981161348"/>
+ 									<bool key="NSIsDisabled">YES</bool>
+@@ -222,7 +209,7 @@
+ 									<reference key="NSOnImage" ref="531645050"/>
+ 									<reference key="NSMixedImage" ref="351811234"/>
+ 								</object>
+-							</object>
++							</array>
+ 						</object>
+ 					</object>
+ 					<object class="NSMenuItem" id="200491363">
+@@ -236,8 +223,7 @@
+ 						<string key="NSAction">submenuAction:</string>
+ 						<object class="NSMenu" key="NSSubmenu" id="526778998">
+ 							<string key="NSTitle">Edit</string>
+-							<object class="NSMutableArray" key="NSMenuItems">
+-								<bool key="EncodedWithXMLCoder">YES</bool>
++							<array class="NSMutableArray" key="NSMenuItems">
+ 								<object class="NSMenuItem" id="185296989">
+ 									<reference key="NSMenu" ref="526778998"/>
+ 									<string key="NSTitle">Copy</string>
+@@ -247,7 +233,7 @@
+ 									<reference key="NSOnImage" ref="531645050"/>
+ 									<reference key="NSMixedImage" ref="351811234"/>
+ 								</object>
+-							</object>
++							</array>
+ 						</object>
+ 					</object>
+ 					<object class="NSMenuItem" id="931553638">
+@@ -263,8 +249,7 @@
+ 							<object class="NSMutableString" key="NSTitle">
+ 								<characters key="NS.bytes">Window</characters>
+ 							</object>
+-							<object class="NSMutableArray" key="NSMenuItems">
+-								<bool key="EncodedWithXMLCoder">YES</bool>
++							<array class="NSMutableArray" key="NSMenuItems">
+ 								<object class="NSMenuItem" id="984461797">
+ 									<reference key="NSMenu" ref="96874957"/>
+ 									<string key="NSTitle">Close</string>
+@@ -341,7 +326,7 @@
+ 									<reference key="NSOnImage" ref="531645050"/>
+ 									<reference key="NSMixedImage" ref="351811234"/>
+ 								</object>
+-							</object>
++							</array>
+ 							<string key="NSName">_NSWindowsMenu</string>
+ 						</object>
+ 					</object>
+@@ -356,8 +341,7 @@
+ 						<string key="NSAction">submenuAction:</string>
+ 						<object class="NSMenu" key="NSSubmenu" id="511848303">
+ 							<string key="NSTitle">Help</string>
+-							<object class="NSMutableArray" key="NSMenuItems">
+-								<bool key="EncodedWithXMLCoder">YES</bool>
++							<array class="NSMutableArray" key="NSMenuItems">
+ 								<object class="NSMenuItem" id="504984881">
+ 									<reference key="NSMenu" ref="511848303"/>
+ 									<string key="NSTitle">X11 Help</string>
+@@ -367,10 +351,10 @@
+ 									<reference key="NSOnImage" ref="531645050"/>
+ 									<reference key="NSMixedImage" ref="351811234"/>
+ 								</object>
+-							</object>
++							</array>
+ 						</object>
+ 					</object>
+-				</object>
++				</array>
+ 				<string key="NSName">_NSMainMenu</string>
+ 			</object>
+ 			<object class="NSCustomObject" id="485884620">
+@@ -386,20 +370,19 @@
+ 				<object class="NSMutableString" key="NSViewClass">
+ 					<characters key="NS.bytes">View</characters>
+ 				</object>
+-				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
++				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
+ 				<string key="NSWindowContentMinSize">{320, 240}</string>
+ 				<object class="NSView" key="NSWindowView" id="941366957">
+-					<nil key="NSNextResponder"/>
++					<reference key="NSNextResponder"/>
+ 					<int key="NSvFlags">256</int>
+-					<object class="NSMutableArray" key="NSSubviews">
+-						<bool key="EncodedWithXMLCoder">YES</bool>
++					<array class="NSMutableArray" key="NSSubviews">
+ 						<object class="NSTabView" id="448510093">
+ 							<reference key="NSNextResponder" ref="941366957"/>
+ 							<int key="NSvFlags">256</int>
+ 							<string key="NSFrame">{{13, 10}, {458, 292}}</string>
+ 							<reference key="NSSuperview" ref="941366957"/>
+-							<object class="NSMutableArray" key="NSTabViewItems">
+-								<bool key="EncodedWithXMLCoder">YES</bool>
++							<reference key="NSWindow"/>
++							<array class="NSMutableArray" key="NSTabViewItems">
+ 								<object class="NSTabViewItem" id="287591690">
+ 									<object class="NSMutableString" key="NSIdentifier">
+ 										<characters key="NS.bytes">1</characters>
+@@ -407,13 +390,13 @@
+ 									<object class="NSView" key="NSView" id="596750588">
+ 										<reference key="NSNextResponder" ref="448510093"/>
+ 										<int key="NSvFlags">256</int>
+-										<object class="NSMutableArray" key="NSSubviews">
+-											<bool key="EncodedWithXMLCoder">YES</bool>
++										<array class="NSMutableArray" key="NSSubviews">
+ 											<object class="NSButton" id="119157981">
+ 												<reference key="NSNextResponder" ref="596750588"/>
+ 												<int key="NSvFlags">256</int>
+ 												<string key="NSFrame">{{18, 210}, {402, 18}}</string>
+ 												<reference key="NSSuperview" ref="596750588"/>
++												<reference key="NSWindow"/>
+ 												<bool key="NSEnabled">YES</bool>
+ 												<object class="NSButtonCell" key="NSCell" id="990762273">
+ 													<int key="NSCellFlags">67239424</int>
+@@ -421,7 +404,7 @@
+ 													<string key="NSContents">Emulate three button mouse</string>
+ 													<object class="NSFont" key="NSSupport" id="463863101">
+ 														<string key="NSName">LucidaGrande</string>
+-														<double key="NSSize">1.300000e+01</double>
++														<double key="NSSize">13</double>
+ 														<int key="NSfFlags">1044</int>
+ 													</object>
+ 													<reference key="NSControlView" ref="119157981"/>
+@@ -441,6 +424,7 @@
+ 												<int key="NSvFlags">256</int>
+ 												<string key="NSFrame">{{36, 60}, {385, 31}}</string>
+ 												<reference key="NSSuperview" ref="596750588"/>
++												<reference key="NSWindow"/>
+ 												<bool key="NSEnabled">YES</bool>
+ 												<object class="NSTextFieldCell" key="NSCell" id="391919450">
+ 													<int key="NSCellFlags">67239424</int>
+@@ -448,7 +432,7 @@
+ 													<string key="NSContents">When enabled, menu bar key equivalents may interfere with X11 applications that use the Meta modifier.</string>
+ 													<object class="NSFont" key="NSSupport" id="26">
+ 														<string key="NSName">LucidaGrande</string>
+-														<double key="NSSize">1.100000e+01</double>
++														<double key="NSSize">11</double>
+ 														<int key="NSfFlags">3100</int>
+ 													</object>
+ 													<reference key="NSControlView" ref="443008216"/>
+@@ -458,7 +442,7 @@
+ 														<string key="NSColorName">controlColor</string>
+ 														<object class="NSColor" key="NSColor" id="590688762">
+ 															<int key="NSColorSpace">3</int>
+-															<bytes key="NSWhite">MC42NjY2NjY2OQA</bytes>
++															<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+ 														</object>
+ 													</object>
+ 													<object class="NSColor" key="NSTextColor" id="930815747">
+@@ -477,6 +461,7 @@
+ 												<int key="NSvFlags">256</int>
+ 												<string key="NSFrame">{{36, 162}, {385, 42}}</string>
+ 												<reference key="NSSuperview" ref="596750588"/>
++												<reference key="NSWindow"/>
+ 												<bool key="NSEnabled">YES</bool>
+ 												<object class="NSTextFieldCell" key="NSCell" id="649334366">
+ 													<int key="NSCellFlags">67239424</int>
+@@ -494,6 +479,7 @@ IG9yIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCg</string>
+ 												<int key="NSvFlags">256</int>
+ 												<string key="NSFrame">{{18, 97}, {402, 18}}</string>
+ 												<reference key="NSSuperview" ref="596750588"/>
++												<reference key="NSWindow"/>
+ 												<bool key="NSEnabled">YES</bool>
+ 												<object class="NSButtonCell" key="NSCell" id="940564599">
+ 													<int key="NSCellFlags">67239424</int>
+@@ -515,6 +501,7 @@ IG9yIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCg</string>
+ 												<int key="NSvFlags">256</int>
+ 												<string key="NSFrame">{{36, 126}, {385, 14}}</string>
+ 												<reference key="NSSuperview" ref="596750588"/>
++												<reference key="NSWindow"/>
+ 												<bool key="NSEnabled">YES</bool>
+ 												<object class="NSTextFieldCell" key="NSCell" id="666057093">
+ 													<int key="NSCellFlags">67239424</int>
+@@ -531,6 +518,7 @@ IG9yIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCg</string>
+ 												<int key="NSvFlags">256</int>
+ 												<string key="NSFrame">{{18, 146}, {402, 18}}</string>
+ 												<reference key="NSSuperview" ref="596750588"/>
++												<reference key="NSWindow"/>
+ 												<bool key="NSEnabled">YES</bool>
+ 												<object class="NSButtonCell" key="NSCell" id="967619578">
+ 													<int key="NSCellFlags">67239424</int>
+@@ -547,9 +535,49 @@ IG9yIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCg</string>
+ 													<int key="NSPeriodicInterval">25</int>
+ 												</object>
+ 											</object>
+-										</object>
++											<object class="NSTextField" id="278155937">
++												<reference key="NSNextResponder" ref="596750588"/>
++												<int key="NSvFlags">256</int>
++												<string key="NSFrame">{{36, -1}, {385, 31}}</string>
++												<reference key="NSSuperview" ref="596750588"/>
++												<reference key="NSWindow"/>
++												<bool key="NSEnabled">YES</bool>
++												<object class="NSTextFieldCell" key="NSCell" id="617441821">
++													<int key="NSCellFlags">67239424</int>
++													<int key="NSCellFlags2">4194304</int>
++													<string key="NSContents">When enabled, the option keys send Alt_L and Alt_R X11 key symbols instead of Mode_switch.</string>
++													<reference key="NSSupport" ref="26"/>
++													<reference key="NSControlView" ref="278155937"/>
++													<reference key="NSBackgroundColor" ref="57160303"/>
++													<reference key="NSTextColor" ref="930815747"/>
++												</object>
++											</object>
++											<object class="NSButton" id="406291430">
++												<reference key="NSNextResponder" ref="596750588"/>
++												<int key="NSvFlags">256</int>
++												<string key="NSFrame">{{18, 36}, {402, 18}}</string>
++												<reference key="NSSuperview" ref="596750588"/>
++												<reference key="NSWindow"/>
++												<bool key="NSEnabled">YES</bool>
++												<object class="NSButtonCell" key="NSCell" id="67728988">
++													<int key="NSCellFlags">67239424</int>
++													<int key="NSCellFlags2">0</int>
++													<string key="NSContents">Option keys send Alt_L and Alt_R</string>
++													<reference key="NSSupport" ref="463863101"/>
++													<reference key="NSControlView" ref="406291430"/>
++													<int key="NSButtonFlags">1211912703</int>
++													<int key="NSButtonFlags2">2</int>
++													<reference key="NSAlternateImage" ref="391434389"/>
++													<string key="NSAlternateContents"/>
++													<string key="NSKeyEquivalent"/>
++													<int key="NSPeriodicDelay">200</int>
++													<int key="NSPeriodicInterval">25</int>
++												</object>
++											</object>
++										</array>
+ 										<string key="NSFrame">{{10, 33}, {438, 246}}</string>
+ 										<reference key="NSSuperview" ref="448510093"/>
++										<reference key="NSWindow"/>
+ 									</object>
+ 									<string key="NSLabel">Input</string>
+ 									<reference key="NSColor" ref="57160303"/>
+@@ -562,8 +590,7 @@ IG9yIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCg</string>
+ 									<object class="NSView" key="NSView" id="515308735">
+ 										<nil key="NSNextResponder"/>
+ 										<int key="NSvFlags">256</int>
+-										<object class="NSMutableArray" key="NSSubviews">
+-											<bool key="EncodedWithXMLCoder">YES</bool>
++										<array class="NSMutableArray" key="NSSubviews">
+ 											<object class="NSButton" id="418227126">
+ 												<reference key="NSNextResponder" ref="515308735"/>
+ 												<int key="NSvFlags">256</int>
+@@ -616,7 +643,7 @@ IG9yIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCg</string>
+ 													<int key="NSButtonFlags2">1</int>
+ 													<object class="NSFont" key="NSAlternateImage">
+ 														<string key="NSName">LucidaGrande</string>
+-														<double key="NSSize">1.300000e+01</double>
++														<double key="NSSize">13</double>
+ 														<int key="NSfFlags">16</int>
+ 													</object>
+ 													<object class="NSMutableString" key="NSAlternateContents">
+@@ -645,8 +672,7 @@ IG9yIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCg</string>
+ 														<object class="NSMutableString" key="NSTitle">
+ 															<characters key="NS.bytes">OtherViews</characters>
+ 														</object>
+-														<object class="NSMutableArray" key="NSMenuItems">
+-															<bool key="EncodedWithXMLCoder">YES</bool>
++														<array class="NSMutableArray" key="NSMenuItems">
+ 															<reference ref="616492372"/>
+ 															<object class="NSMenuItem" id="759499526">
+ 																<reference key="NSMenu" ref="341113515"/>
+@@ -684,7 +710,7 @@ IG9yIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCg</string>
+ 																<int key="NSTag">24</int>
+ 																<reference key="NSTarget" ref="633115429"/>
+ 															</object>
+-														</object>
++														</array>
+ 													</object>
+ 													<int key="NSPreferredEdge">3</int>
+ 													<bool key="NSUsesItemFromMenu">YES</bool>
+@@ -701,7 +727,7 @@ IG9yIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCg</string>
+ 												<object class="NSTextFieldCell" key="NSCell" id="930265681">
+ 													<int key="NSCellFlags">67239424</int>
+ 													<int key="NSCellFlags2">4194304</int>
+-													<string type="base64-UTF8" key="NSContents">Q29sb3JzOgo</string>
++													<string key="NSContents">Colors:</string>
+ 													<reference key="NSSupport" ref="463863101"/>
+ 													<reference key="NSControlView" ref="201731424"/>
+ 													<reference key="NSBackgroundColor" ref="57160303"/>
+@@ -782,7 +808,7 @@ IG9yIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCg</string>
+ 													<reference key="NSTextColor" ref="930815747"/>
+ 												</object>
+ 											</object>
+-										</object>
++										</array>
+ 										<string key="NSFrame">{{10, 33}, {438, 246}}</string>
+ 									</object>
+ 									<string key="NSLabel">Output</string>
+@@ -796,8 +822,7 @@ IG9yIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCg</string>
+ 									<object class="NSView" key="NSView" id="408298283">
+ 										<nil key="NSNextResponder"/>
+ 										<int key="NSvFlags">256</int>
+-										<object class="NSMutableArray" key="NSSubviews">
+-											<bool key="EncodedWithXMLCoder">YES</bool>
++										<array class="NSMutableArray" key="NSSubviews">
+ 											<object class="NSButton" id="878106058">
+ 												<reference key="NSNextResponder" ref="408298283"/>
+ 												<int key="NSvFlags">256</int>
+@@ -828,9 +853,7 @@ IG9yIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCg</string>
+ 												<object class="NSTextFieldCell" key="NSCell" id="572508492">
+ 													<int key="NSCellFlags">67239424</int>
+ 													<int key="NSCellFlags2">4194304</int>
+-													<string type="base64-UTF8" key="NSContents">RW5hYmxlcyB0aGUgImNvcHkiIG1lbnUgaXRlbSBhbmQgYWxsb3dzIGZvciBzeW5jaW5nIGJldHdlZW4g
+-dGhlIE9TWCBQYXN0ZWJvYXJkIGFuZCB0aGUgWDExIENMSVBCT0FSRCBhbmQgUFJJTUFSWSBidWZmZXJz
+-Lg</string>
++													<string key="NSContents">Enables the "copy" menu item and allows for syncing between the OSX Pasteboard and the X11 CLIPBOARD and PRIMARY buffers.</string>
+ 													<reference key="NSSupport" ref="26"/>
+ 													<reference key="NSControlView" ref="386152084"/>
+ 													<reference key="NSBackgroundColor" ref="57160303"/>
+@@ -953,7 +976,7 @@ Lg</string>
+ 													<reference key="NSTextColor" ref="930815747"/>
+ 												</object>
+ 											</object>
+-										</object>
++										</array>
+ 										<string key="NSFrame">{{10, 33}, {438, 246}}</string>
+ 									</object>
+ 									<string key="NSLabel">Pasteboard</string>
+@@ -967,8 +990,7 @@ Lg</string>
+ 									<object class="NSView" key="NSView" id="184765684">
+ 										<nil key="NSNextResponder"/>
+ 										<int key="NSvFlags">256</int>
+-										<object class="NSMutableArray" key="NSSubviews">
+-											<bool key="EncodedWithXMLCoder">YES</bool>
++										<array class="NSMutableArray" key="NSSubviews">
+ 											<object class="NSButton" id="657659108">
+ 												<reference key="NSNextResponder" ref="184765684"/>
+ 												<int key="NSvFlags">256</int>
+@@ -1080,7 +1102,7 @@ Lg</string>
+ 													<reference key="NSTextColor" ref="930815747"/>
+ 												</object>
+ 											</object>
+-										</object>
++										</array>
+ 										<string key="NSFrame">{{10, 33}, {438, 246}}</string>
+ 									</object>
+ 									<string key="NSLabel">Windows</string>
+@@ -1091,8 +1113,7 @@ Lg</string>
+ 									<object class="NSView" key="NSView" id="300811574">
+ 										<nil key="NSNextResponder"/>
+ 										<int key="NSvFlags">256</int>
+-										<object class="NSMutableArray" key="NSSubviews">
+-											<bool key="EncodedWithXMLCoder">YES</bool>
++										<array class="NSMutableArray" key="NSSubviews">
+ 											<object class="NSButton" id="989050925">
+ 												<reference key="NSNextResponder" ref="300811574"/>
+ 												<int key="NSvFlags">256</int>
+@@ -1144,9 +1165,7 @@ Lg</string>
+ 												<object class="NSTextFieldCell" key="NSCell" id="53243865">
+ 													<int key="NSCellFlags">67239424</int>
+ 													<int key="NSCellFlags2">4194304</int>
+-													<string type="base64-UTF8" key="NSContents">TGF1bmNoaW5nIFgxMSB3aWxsIGNyZWF0ZSBYYXV0aG9yaXR5IGFjY2Vzcy1jb250cm9sIGtleXMuIElm
+-IHRoZSBzeXN0ZW0ncyBJUCBhZGRyZXNzIGNoYW5nZXMsIHRoZXNlIGtleXMgYmVjb21lIGludmFsaWQg
+-d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
++													<string key="NSContents">Launching X11 will create Xauthority access-control keys. If the system's IP address changes, these keys become invalid which may prevent X11 applications from launching.</string>
+ 													<reference key="NSSupport" ref="26"/>
+ 													<reference key="NSControlView" ref="168436707"/>
+ 													<reference key="NSBackgroundColor" ref="57160303"/>
+@@ -1185,30 +1204,31 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 													<reference key="NSTextColor" ref="930815747"/>
+ 												</object>
+ 											</object>
+-										</object>
++										</array>
+ 										<string key="NSFrame">{{10, 33}, {438, 246}}</string>
+ 									</object>
+ 									<string key="NSLabel">Security</string>
+ 									<reference key="NSColor" ref="57160303"/>
+ 									<reference key="NSTabView" ref="448510093"/>
+ 								</object>
+-							</object>
++							</array>
+ 							<reference key="NSSelectedTabViewItem" ref="287591690"/>
+ 							<reference key="NSFont" ref="463863101"/>
+ 							<int key="NSTvFlags">0</int>
+ 							<bool key="NSAllowTruncatedLabels">YES</bool>
+ 							<bool key="NSDrawsBackground">YES</bool>
+-							<object class="NSMutableArray" key="NSSubviews">
+-								<bool key="EncodedWithXMLCoder">YES</bool>
++							<array class="NSMutableArray" key="NSSubviews">
+ 								<reference ref="596750588"/>
+-							</object>
++							</array>
+ 						</object>
+-					</object>
++					</array>
+ 					<string key="NSFrameSize">{484, 308}</string>
++					<reference key="NSSuperview"/>
++					<reference key="NSWindow"/>
+ 				</object>
+ 				<string key="NSScreenRect">{{0, 0}, {1280, 938}}</string>
+ 				<string key="NSMinSize">{320, 262}</string>
+-				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
++				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
+ 				<string key="NSFrameAutosaveName">x11_prefs</string>
+ 			</object>
+ 			<object class="NSWindowTemplate" id="604417141">
+@@ -1221,13 +1241,12 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 				<object class="NSMutableString" key="NSViewClass">
+ 					<characters key="NS.bytes">View</characters>
+ 				</object>
+-				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
++				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
+ 				<string key="NSWindowContentMinSize">{320, 240}</string>
+ 				<object class="NSView" key="NSWindowView" id="85544634">
+ 					<nil key="NSNextResponder"/>
+ 					<int key="NSvFlags">256</int>
+-					<object class="NSMutableArray" key="NSSubviews">
+-						<bool key="EncodedWithXMLCoder">YES</bool>
++					<array class="NSMutableArray" key="NSSubviews">
+ 						<object class="NSButton" id="671954382">
+ 							<reference key="NSNextResponder" ref="85544634"/>
+ 							<int key="NSvFlags">265</int>
+@@ -1244,7 +1263,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 								<int key="NSButtonFlags2">1</int>
+ 								<object class="NSFont" key="NSAlternateImage" id="549406736">
+ 									<string key="NSName">Helvetica</string>
+-									<double key="NSSize">1.300000e+01</double>
++									<double key="NSSize">13</double>
+ 									<int key="NSfFlags">16</int>
+ 								</object>
+ 								<object class="NSMutableString" key="NSAlternateContents">
+@@ -1285,13 +1304,11 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 						<object class="NSScrollView" id="1063387772">
+ 							<reference key="NSNextResponder" ref="85544634"/>
+ 							<int key="NSvFlags">274</int>
+-							<object class="NSMutableArray" key="NSSubviews">
+-								<bool key="EncodedWithXMLCoder">YES</bool>
++							<array class="NSMutableArray" key="NSSubviews">
+ 								<object class="NSClipView" id="580565898">
+ 									<reference key="NSNextResponder" ref="1063387772"/>
+ 									<int key="NSvFlags">2304</int>
+-									<object class="NSMutableArray" key="NSSubviews">
+-										<bool key="EncodedWithXMLCoder">YES</bool>
++									<array class="NSMutableArray" key="NSSubviews">
+ 										<object class="NSTableView" id="905092943">
+ 											<reference key="NSNextResponder" ref="580565898"/>
+ 											<int key="NSvFlags">256</int>
+@@ -1311,15 +1328,14 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 												<string key="NSFrame">{{302, 0}, {16, 17}}</string>
+ 												<reference key="NSSuperview" ref="1063387772"/>
+ 											</object>
+-											<object class="NSMutableArray" key="NSTableColumns">
+-												<bool key="EncodedWithXMLCoder">YES</bool>
++											<array class="NSMutableArray" key="NSTableColumns">
+ 												<object class="NSTableColumn" id="938444323">
+-													<double key="NSWidth">1.217310e+02</double>
+-													<double key="NSMinWidth">6.273100e+01</double>
+-													<double key="NSMaxWidth">1.000000e+03</double>
++													<double key="NSWidth">121.73099999999999</double>
++													<double key="NSMinWidth">62.731000000000002</double>
++													<double key="NSMaxWidth">1000</double>
+ 													<object class="NSTableHeaderCell" key="NSHeaderCell">
+-														<int key="NSCellFlags">75628032</int>
+-														<int key="NSCellFlags2">0</int>
++														<int key="NSCellFlags">75628096</int>
++														<int key="NSCellFlags2">2048</int>
+ 														<string key="NSContents">Name</string>
+ 														<reference key="NSSupport" ref="26"/>
+ 														<object class="NSColor" key="NSBackgroundColor" id="113872566">
+@@ -1351,12 +1367,12 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 													<reference key="NSTableView" ref="905092943"/>
+ 												</object>
+ 												<object class="NSTableColumn" id="84282687">
+-													<double key="NSWidth">9.900000e+01</double>
+-													<double key="NSMinWidth">4.000000e+01</double>
+-													<double key="NSMaxWidth">1.000000e+03</double>
++													<double key="NSWidth">99</double>
++													<double key="NSMinWidth">40</double>
++													<double key="NSMaxWidth">1000</double>
+ 													<object class="NSTableHeaderCell" key="NSHeaderCell">
+-														<int key="NSCellFlags">75628032</int>
+-														<int key="NSCellFlags2">0</int>
++														<int key="NSCellFlags">75628096</int>
++														<int key="NSCellFlags2">2048</int>
+ 														<string key="NSContents">Command</string>
+ 														<reference key="NSSupport" ref="26"/>
+ 														<reference key="NSBackgroundColor" ref="113872566"/>
+@@ -1377,12 +1393,12 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 													<reference key="NSTableView" ref="905092943"/>
+ 												</object>
+ 												<object class="NSTableColumn" id="242608782">
+-													<double key="NSWidth">7.100000e+01</double>
+-													<double key="NSMinWidth">1.000000e+01</double>
+-													<double key="NSMaxWidth">1.000000e+03</double>
++													<double key="NSWidth">71</double>
++													<double key="NSMinWidth">10</double>
++													<double key="NSMaxWidth">1000</double>
+ 													<object class="NSTableHeaderCell" key="NSHeaderCell">
+-														<int key="NSCellFlags">67239424</int>
+-														<int key="NSCellFlags2">0</int>
++														<int key="NSCellFlags">75628096</int>
++														<int key="NSCellFlags2">2048</int>
+ 														<string key="NSContents">Shortcut</string>
+ 														<reference key="NSSupport" ref="26"/>
+ 														<object class="NSColor" key="NSBackgroundColor">
+@@ -1399,7 +1415,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 														<string key="NSContents">Text Cell</string>
+ 														<object class="NSFont" key="NSSupport">
+ 															<string key="NSName">LucidaGrande</string>
+-															<double key="NSSize">1.200000e+01</double>
++															<double key="NSSize">12</double>
+ 															<int key="NSfFlags">16</int>
+ 														</object>
+ 														<reference key="NSControlView" ref="905092943"/>
+@@ -1417,9 +1433,9 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 													<bool key="NSIsEditable">YES</bool>
+ 													<reference key="NSTableView" ref="905092943"/>
+ 												</object>
+-											</object>
+-											<double key="NSIntercellSpacingWidth">3.000000e+00</double>
+-											<double key="NSIntercellSpacingHeight">2.000000e+00</double>
++											</array>
++											<double key="NSIntercellSpacingWidth">3</double>
++											<double key="NSIntercellSpacingHeight">2</double>
+ 											<reference key="NSBackgroundColor" ref="822946413"/>
+ 											<object class="NSColor" key="NSGridColor">
+ 												<int key="NSColorSpace">6</int>
+@@ -1430,14 +1446,17 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 													<bytes key="NSWhite">MC41AA</bytes>
+ 												</object>
+ 											</object>
+-											<double key="NSRowHeight">1.700000e+01</double>
++											<double key="NSRowHeight">17</double>
+ 											<int key="NSTvFlags">1379958784</int>
++											<reference key="NSDelegate"/>
++											<reference key="NSDataSource"/>
+ 											<int key="NSColumnAutoresizingStyle">1</int>
+ 											<int key="NSDraggingSourceMaskForLocal">-1</int>
+ 											<int key="NSDraggingSourceMaskForNonLocal">0</int>
+ 											<bool key="NSAllowsTypeSelect">YES</bool>
++											<int key="NSTableViewDraggingDestinationStyle">0</int>
+ 										</object>
+-									</object>
++									</array>
+ 									<string key="NSFrame">{{1, 17}, {301, 198}}</string>
+ 									<reference key="NSSuperview" ref="1063387772"/>
+ 									<reference key="NSNextKeyView" ref="905092943"/>
+@@ -1452,7 +1471,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 									<reference key="NSSuperview" ref="1063387772"/>
+ 									<reference key="NSTarget" ref="1063387772"/>
+ 									<string key="NSAction">_doScroller:</string>
+-									<double key="NSPercent">9.949238e-01</double>
++									<double key="NSPercent">0.99492380000000002</double>
+ 								</object>
+ 								<object class="NSScroller" id="17278747">
+ 									<reference key="NSNextResponder" ref="1063387772"/>
+@@ -1462,15 +1481,14 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 									<int key="NSsFlags">1</int>
+ 									<reference key="NSTarget" ref="1063387772"/>
+ 									<string key="NSAction">_doScroller:</string>
+-									<double key="NSPercent">6.885246e-01</double>
++									<double key="NSPercent">0.68852460000000004</double>
+ 								</object>
+ 								<object class="NSClipView" id="672307654">
+ 									<reference key="NSNextResponder" ref="1063387772"/>
+ 									<int key="NSvFlags">2304</int>
+-									<object class="NSMutableArray" key="NSSubviews">
+-										<bool key="EncodedWithXMLCoder">YES</bool>
++									<array class="NSMutableArray" key="NSSubviews">
+ 										<reference ref="792419186"/>
+-									</object>
++									</array>
+ 									<string key="NSFrame">{{1, 0}, {301, 17}}</string>
+ 									<reference key="NSSuperview" ref="1063387772"/>
+ 									<reference key="NSNextKeyView" ref="792419186"/>
+@@ -1479,7 +1497,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 									<int key="NScvFlags">4</int>
+ 								</object>
+ 								<reference ref="898633680"/>
+-							</object>
++							</array>
+ 							<string key="NSFrame">{{20, 20}, {318, 231}}</string>
+ 							<reference key="NSSuperview" ref="85544634"/>
+ 							<reference key="NSNextKeyView" ref="580565898"/>
+@@ -1488,7 +1506,6 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 							<reference key="NSHScroller" ref="17278747"/>
+ 							<reference key="NSContentView" ref="580565898"/>
+ 							<reference key="NSHeaderClipView" ref="672307654"/>
+-							<reference key="NSCornerView" ref="898633680"/>
+ 							<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
+ 						</object>
+ 						<object class="NSButton" id="758204686">
+@@ -1516,18 +1533,17 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 								<int key="NSPeriodicInterval">25</int>
+ 							</object>
+ 						</object>
+-					</object>
++					</array>
+ 					<string key="NSFrameSize">{454, 271}</string>
+ 				</object>
+ 				<string key="NSScreenRect">{{0, 0}, {1280, 938}}</string>
+ 				<string key="NSMinSize">{320, 262}</string>
+-				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
++				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
+ 				<string key="NSFrameAutosaveName">x11_apps</string>
+ 			</object>
+ 			<object class="NSMenu" id="294137138">
+ 				<string key="NSTitle">Menu</string>
+-				<object class="NSMutableArray" key="NSMenuItems">
+-					<bool key="EncodedWithXMLCoder">YES</bool>
++				<array class="NSMutableArray" key="NSMenuItems">
+ 					<object class="NSMenuItem" id="318286212">
+ 						<reference key="NSMenu" ref="294137138"/>
+ 						<bool key="NSIsDisabled">YES</bool>
+@@ -1550,8 +1566,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 						<string key="NSAction">submenuAction:</string>
+ 						<object class="NSMenu" key="NSSubmenu" id="48278059">
+ 							<string key="NSTitle">Applications</string>
+-							<object class="NSMutableArray" key="NSMenuItems">
+-								<bool key="EncodedWithXMLCoder">YES</bool>
++							<array class="NSMutableArray" key="NSMenuItems">
+ 								<object class="NSMenuItem" id="563798000">
+ 									<reference key="NSMenu" ref="48278059"/>
+ 									<bool key="NSIsDisabled">YES</bool>
+@@ -1565,23 +1580,22 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 								</object>
+ 								<object class="NSMenuItem" id="1032342329">
+ 									<reference key="NSMenu" ref="48278059"/>
+-									<string type="base64-UTF8" key="NSTitle">Q3VzdG9taXpl4oCmA</string>
++									<string key="NSTitle">Customize…</string>
+ 									<string key="NSKeyEquiv"/>
+ 									<int key="NSKeyEquivModMask">1048576</int>
+ 									<int key="NSMnemonicLoc">2147483647</int>
+ 									<reference key="NSOnImage" ref="531645050"/>
+ 									<reference key="NSMixedImage" ref="351811234"/>
+ 								</object>
+-							</object>
++							</array>
+ 						</object>
+ 					</object>
+-				</object>
++				</array>
+ 				<string key="NSName"/>
+ 			</object>
+-		</object>
++		</array>
+ 		<object class="IBObjectContainer" key="IBDocument.Objects">
+-			<object class="NSMutableArray" key="connectionRecords">
+-				<bool key="EncodedWithXMLCoder">YES</bool>
++			<array class="NSMutableArray" key="connectionRecords">
+ 				<object class="IBConnectionRecord">
+ 					<object class="IBActionConnection" key="connection">
+ 						<string key="label">copy:</string>
+@@ -2126,64 +2140,74 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 					</object>
+ 					<int key="connectionID">300475</int>
+ 				</object>
+-			</object>
++				<object class="IBConnectionRecord">
++					<object class="IBActionConnection" key="connection">
++						<string key="label">prefs_changed:</string>
++						<reference key="source" ref="485884620"/>
++						<reference key="destination" ref="406291430"/>
++					</object>
++					<int key="connectionID">300480</int>
++				</object>
++				<object class="IBConnectionRecord">
++					<object class="IBOutletConnection" key="connection">
++						<string key="label">option_sends_alt</string>
++						<reference key="source" ref="485884620"/>
++						<reference key="destination" ref="406291430"/>
++					</object>
++					<int key="connectionID">300481</int>
++				</object>
++			</array>
+ 			<object class="IBMutableOrderedSet" key="objectRecords">
+-				<object class="NSArray" key="orderedObjects">
+-					<bool key="EncodedWithXMLCoder">YES</bool>
++				<array key="orderedObjects">
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">0</int>
+-						<object class="NSArray" key="object" id="330408435">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
+-						</object>
++						<array key="object" id="0"/>
+ 						<reference key="children" ref="904585544"/>
+ 						<nil key="parent"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">-2</int>
+ 						<reference key="object" ref="815810918"/>
+-						<reference key="parent" ref="330408435"/>
+-						<string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string>
++						<reference key="parent" ref="0"/>
++						<string key="objectName">File's Owner</string>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">-1</int>
+ 						<reference key="object" ref="941939442"/>
+-						<reference key="parent" ref="330408435"/>
++						<reference key="parent" ref="0"/>
+ 						<string key="objectName">First Responder</string>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">-3</int>
+ 						<reference key="object" ref="951368722"/>
+-						<reference key="parent" ref="330408435"/>
++						<reference key="parent" ref="0"/>
+ 						<string key="objectName">Application</string>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">29</int>
+ 						<reference key="object" ref="524015605"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="931553638"/>
+ 							<reference ref="365880285"/>
+ 							<reference ref="200491363"/>
+ 							<reference ref="868031522"/>
+ 							<reference ref="551174276"/>
+-						</object>
+-						<reference key="parent" ref="330408435"/>
++						</array>
++						<reference key="parent" ref="0"/>
+ 						<string key="objectName">MainMenu</string>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">19</int>
+ 						<reference key="object" ref="931553638"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="96874957"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="524015605"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">24</int>
+ 						<reference key="object" ref="96874957"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="677652931"/>
+ 							<reference ref="276216762"/>
+ 							<reference ref="1066447520"/>
+@@ -2192,7 +2216,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 							<reference ref="155085383"/>
+ 							<reference ref="984461797"/>
+ 							<reference ref="280172320"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="931553638"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+@@ -2238,17 +2262,15 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">56</int>
+ 						<reference key="object" ref="365880285"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="576521955"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="524015605"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">57</int>
+ 						<reference key="object" ref="576521955"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="139290918"/>
+ 							<reference ref="386173216"/>
+ 							<reference ref="32285361"/>
+@@ -2261,7 +2283,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 							<reference ref="1023546148"/>
+ 							<reference ref="6876565"/>
+ 							<reference ref="479677589"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="365880285"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+@@ -2277,10 +2299,9 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">131</int>
+ 						<reference key="object" ref="32285361"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="821388474"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="576521955"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+@@ -2336,19 +2357,17 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">163</int>
+ 						<reference key="object" ref="200491363"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="526778998"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="524015605"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">169</int>
+ 						<reference key="object" ref="526778998"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="185296989"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="200491363"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+@@ -2359,20 +2378,18 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">269</int>
+ 						<reference key="object" ref="868031522"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="981161348"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="524015605"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">270</int>
+ 						<reference key="object" ref="981161348"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="390088328"/>
+ 							<reference ref="1065386165"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="868031522"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+@@ -2388,19 +2405,17 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">419</int>
+ 						<reference key="object" ref="551174276"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="511848303"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="524015605"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">420</int>
+ 						<reference key="object" ref="511848303"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="504984881"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="551174276"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+@@ -2411,132 +2426,121 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">196</int>
+ 						<reference key="object" ref="485884620"/>
+-						<reference key="parent" ref="330408435"/>
++						<reference key="parent" ref="0"/>
+ 						<string key="objectName">X11Controller</string>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">244</int>
+ 						<reference key="object" ref="124913468"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="941366957"/>
+-						</object>
+-						<reference key="parent" ref="330408435"/>
++						</array>
++						<reference key="parent" ref="0"/>
+ 						<string key="objectName">PrefsPanel</string>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">245</int>
+ 						<reference key="object" ref="941366957"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="448510093"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="124913468"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">348</int>
+ 						<reference key="object" ref="448510093"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="287591690"/>
+ 							<reference ref="960678392"/>
+ 							<reference ref="348328898"/>
+ 							<reference ref="10973343"/>
+ 							<reference ref="723450037"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="941366957"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">349</int>
+ 						<reference key="object" ref="287591690"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="596750588"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="448510093"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">351</int>
+ 						<reference key="object" ref="596750588"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="119157981"/>
+ 							<reference ref="443008216"/>
+ 							<reference ref="282885445"/>
+ 							<reference ref="842100515"/>
+ 							<reference ref="31160162"/>
+ 							<reference ref="179949713"/>
+-						</object>
++							<reference ref="278155937"/>
++							<reference ref="406291430"/>
++						</array>
+ 						<reference key="parent" ref="287591690"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">363</int>
+ 						<reference key="object" ref="119157981"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="990762273"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="596750588"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">364</int>
+ 						<reference key="object" ref="443008216"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="391919450"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="596750588"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">365</int>
+ 						<reference key="object" ref="282885445"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="649334366"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="596750588"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">368</int>
+ 						<reference key="object" ref="842100515"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="940564599"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="596750588"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">369</int>
+ 						<reference key="object" ref="31160162"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="666057093"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="596750588"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">370</int>
+ 						<reference key="object" ref="179949713"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="967619578"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="596750588"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">352</int>
+ 						<reference key="object" ref="960678392"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="515308735"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="448510093"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">350</int>
+ 						<reference key="object" ref="515308735"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="709074847"/>
+ 							<reference ref="201731424"/>
+ 							<reference ref="86150604"/>
+@@ -2545,170 +2549,153 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 							<reference ref="298603383"/>
+ 							<reference ref="418227126"/>
+ 							<reference ref="1039016593"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="960678392"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">371</int>
+ 						<reference key="object" ref="418227126"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="1016069354"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="515308735"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">372</int>
+ 						<reference key="object" ref="1039016593"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="624655599"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="515308735"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">382</int>
+ 						<reference key="object" ref="709074847"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="633115429"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="515308735"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">385</int>
+ 						<reference key="object" ref="201731424"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="930265681"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="515308735"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">386</int>
+ 						<reference key="object" ref="86150604"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="311969422"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="515308735"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">541</int>
+ 						<reference key="object" ref="477203622"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="631531164"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="515308735"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">543</int>
+ 						<reference key="object" ref="298603383"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="761107402"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="515308735"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">353</int>
+ 						<reference key="object" ref="348328898"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="300811574"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="448510093"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">354</int>
+ 						<reference key="object" ref="300811574"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="989050925"/>
+ 							<reference ref="700826966"/>
+ 							<reference ref="168436707"/>
+ 							<reference ref="363817195"/>
+ 							<reference ref="223835729"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="348328898"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">374</int>
+ 						<reference key="object" ref="989050925"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="189594322"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="300811574"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">375</int>
+ 						<reference key="object" ref="700826966"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="489340979"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="300811574"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">376</int>
+ 						<reference key="object" ref="168436707"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="53243865"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="300811574"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">377</int>
+ 						<reference key="object" ref="363817195"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="390084685"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="300811574"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">379</int>
+ 						<reference key="object" ref="223835729"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="283628678"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="300811574"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">285</int>
+ 						<reference key="object" ref="604417141"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="85544634"/>
+-						</object>
+-						<reference key="parent" ref="330408435"/>
++						</array>
++						<reference key="parent" ref="0"/>
+ 						<string key="objectName">EditPrograms</string>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">286</int>
+ 						<reference key="object" ref="85544634"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="1063387772"/>
+ 							<reference ref="758204686"/>
+ 							<reference ref="671954382"/>
+ 							<reference ref="492358940"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="604417141"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">423</int>
+ 						<reference key="object" ref="294137138"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="318286212"/>
+ 							<reference ref="511651072"/>
+-						</object>
+-						<reference key="parent" ref="330408435"/>
++						</array>
++						<reference key="parent" ref="0"/>
+ 						<string key="objectName">DockMenu</string>
+ 					</object>
+ 					<object class="IBObjectRecord">
+@@ -2719,20 +2706,18 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">526</int>
+ 						<reference key="object" ref="511651072"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="48278059"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="294137138"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">527</int>
+ 						<reference key="object" ref="48278059"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="1032342329"/>
+ 							<reference ref="563798000"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="511651072"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+@@ -2788,10 +2773,9 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">100382</int>
+ 						<reference key="object" ref="633115429"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="341113515"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="709074847"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+@@ -2842,13 +2826,12 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">380</int>
+ 						<reference key="object" ref="341113515"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="759499526"/>
+ 							<reference ref="616492372"/>
+ 							<reference ref="543935434"/>
+ 							<reference ref="836673018"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="633115429"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+@@ -2874,13 +2857,12 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">295</int>
+ 						<reference key="object" ref="1063387772"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="792419186"/>
+ 							<reference ref="17278747"/>
+ 							<reference ref="842897584"/>
+ 							<reference ref="905092943"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="85544634"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+@@ -2901,21 +2883,19 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">296</int>
+ 						<reference key="object" ref="905092943"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="242608782"/>
+ 							<reference ref="938444323"/>
+ 							<reference ref="84282687"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="1063387772"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">535</int>
+ 						<reference key="object" ref="242608782"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="34714764"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="905092943"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+@@ -2926,10 +2906,9 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">298</int>
+ 						<reference key="object" ref="938444323"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="825378892"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="905092943"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+@@ -2940,10 +2919,9 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">297</int>
+ 						<reference key="object" ref="84282687"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="432610585"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="905092943"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+@@ -2954,10 +2932,9 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">310</int>
+ 						<reference key="object" ref="758204686"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="1025474039"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="85544634"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+@@ -2968,10 +2945,9 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">292</int>
+ 						<reference key="object" ref="671954382"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="143554520"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="85544634"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+@@ -2982,10 +2958,9 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">293</int>
+ 						<reference key="object" ref="492358940"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="8201128"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="85544634"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+@@ -2996,42 +2971,38 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">300337</int>
+ 						<reference key="object" ref="10973343"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="184765684"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="448510093"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">300338</int>
+ 						<reference key="object" ref="184765684"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="657659108"/>
+ 							<reference ref="290578835"/>
+ 							<reference ref="992839333"/>
+ 							<reference ref="138261120"/>
+ 							<reference ref="128352289"/>
+ 							<reference ref="57161931"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="10973343"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">300358</int>
+ 						<reference key="object" ref="290578835"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="399127858"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="184765684"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">300359</int>
+ 						<reference key="object" ref="657659108"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="259618205"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="184765684"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+@@ -3047,10 +3018,9 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">300362</int>
+ 						<reference key="object" ref="992839333"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="959555182"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="184765684"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+@@ -3061,10 +3031,9 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">300364</int>
+ 						<reference key="object" ref="138261120"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="183409141"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="184765684"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+@@ -3075,10 +3044,9 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">300368</int>
+ 						<reference key="object" ref="128352289"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="556463187"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="184765684"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+@@ -3089,10 +3057,9 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">300370</int>
+ 						<reference key="object" ref="57161931"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="989804990"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="184765684"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+@@ -3103,17 +3070,15 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">300421</int>
+ 						<reference key="object" ref="723450037"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="408298283"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="448510093"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">300422</int>
+ 						<reference key="object" ref="408298283"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="878106058"/>
+ 							<reference ref="386152084"/>
+ 							<reference ref="487809555"/>
+@@ -3122,25 +3087,23 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 							<reference ref="765780304"/>
+ 							<reference ref="1002778833"/>
+ 							<reference ref="522511724"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="723450037"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">300423</int>
+ 						<reference key="object" ref="386152084"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="572508492"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="408298283"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">300424</int>
+ 						<reference key="object" ref="878106058"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="718083688"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="408298283"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+@@ -3156,10 +3119,9 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">300447</int>
+ 						<reference key="object" ref="477050998"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="501304422"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="408298283"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+@@ -3170,10 +3132,9 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">300451</int>
+ 						<reference key="object" ref="765780304"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="510771323"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="408298283"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+@@ -3184,10 +3145,9 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">300453</int>
+ 						<reference key="object" ref="487809555"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="619977658"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="408298283"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+@@ -3198,10 +3158,9 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">300455</int>
+ 						<reference key="object" ref="620944856"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="461823902"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="408298283"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+@@ -3212,10 +3171,9 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">300457</int>
+ 						<reference key="object" ref="1002778833"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="897099877"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="408298283"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+@@ -3226,10 +3184,9 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">300459</int>
+ 						<reference key="object" ref="522511724"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="994587858"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="408298283"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+@@ -3240,10 +3197,9 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 					<object class="IBObjectRecord">
+ 						<int key="objectID">300472</int>
+ 						<reference key="object" ref="57246850"/>
+-						<object class="NSMutableArray" key="children">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
++						<array class="NSMutableArray" key="children">
+ 							<reference ref="917248662"/>
+-						</object>
++						</array>
+ 						<reference key="parent" ref="515308735"/>
+ 					</object>
+ 					<object class="IBObjectRecord">
+@@ -3251,610 +3207,333 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 						<reference key="object" ref="917248662"/>
+ 						<reference key="parent" ref="57246850"/>
+ 					</object>
+-				</object>
+-			</object>
+-			<object class="NSMutableDictionary" key="flattenedProperties">
+-				<bool key="EncodedWithXMLCoder">YES</bool>
+-				<object class="NSMutableArray" key="dict.sortedKeys">
+-					<bool key="EncodedWithXMLCoder">YES</bool>
+-					<string>-1.IBPluginDependency</string>
+-					<string>-2.IBPluginDependency</string>
+-					<string>-3.IBPluginDependency</string>
+-					<string>-3.ImportedFromIB2</string>
+-					<string>100292.IBPluginDependency</string>
+-					<string>100293.IBPluginDependency</string>
+-					<string>100295.IBPluginDependency</string>
+-					<string>100295.IBShouldRemoveOnLegacySave</string>
+-					<string>100310.IBPluginDependency</string>
+-					<string>100363.IBPluginDependency</string>
+-					<string>100364.IBPluginDependency</string>
+-					<string>100365.IBPluginDependency</string>
+-					<string>100368.IBPluginDependency</string>
+-					<string>100369.IBPluginDependency</string>
+-					<string>100370.IBPluginDependency</string>
+-					<string>100371.IBPluginDependency</string>
+-					<string>100372.IBPluginDependency</string>
+-					<string>100374.IBPluginDependency</string>
+-					<string>100375.IBPluginDependency</string>
+-					<string>100376.IBPluginDependency</string>
+-					<string>100377.IBPluginDependency</string>
+-					<string>100379.IBPluginDependency</string>
+-					<string>100382.IBPluginDependency</string>
+-					<string>100385.IBPluginDependency</string>
+-					<string>100386.IBPluginDependency</string>
+-					<string>100541.IBPluginDependency</string>
+-					<string>100543.IBPluginDependency</string>
+-					<string>129.IBPluginDependency</string>
+-					<string>129.ImportedFromIB2</string>
+-					<string>130.IBPluginDependency</string>
+-					<string>130.ImportedFromIB2</string>
+-					<string>131.IBPluginDependency</string>
+-					<string>131.ImportedFromIB2</string>
+-					<string>134.IBPluginDependency</string>
+-					<string>134.ImportedFromIB2</string>
+-					<string>136.IBPluginDependency</string>
+-					<string>136.ImportedFromIB2</string>
+-					<string>143.IBPluginDependency</string>
+-					<string>143.ImportedFromIB2</string>
+-					<string>144.IBPluginDependency</string>
+-					<string>144.ImportedFromIB2</string>
+-					<string>145.IBPluginDependency</string>
+-					<string>145.ImportedFromIB2</string>
+-					<string>149.IBPluginDependency</string>
+-					<string>149.ImportedFromIB2</string>
+-					<string>150.IBPluginDependency</string>
+-					<string>150.ImportedFromIB2</string>
+-					<string>157.IBPluginDependency</string>
+-					<string>157.ImportedFromIB2</string>
+-					<string>163.IBPluginDependency</string>
+-					<string>163.ImportedFromIB2</string>
+-					<string>169.IBEditorWindowLastContentRect</string>
+-					<string>169.IBPluginDependency</string>
+-					<string>169.ImportedFromIB2</string>
+-					<string>169.editorWindowContentRectSynchronizationRect</string>
+-					<string>19.IBPluginDependency</string>
+-					<string>19.ImportedFromIB2</string>
+-					<string>196.IBPluginDependency</string>
+-					<string>196.ImportedFromIB2</string>
+-					<string>200295.IBPluginDependency</string>
+-					<string>200295.IBShouldRemoveOnLegacySave</string>
+-					<string>203.IBPluginDependency</string>
+-					<string>203.ImportedFromIB2</string>
+-					<string>204.IBPluginDependency</string>
+-					<string>204.ImportedFromIB2</string>
+-					<string>23.IBPluginDependency</string>
+-					<string>23.ImportedFromIB2</string>
+-					<string>24.IBEditorWindowLastContentRect</string>
+-					<string>24.IBPluginDependency</string>
+-					<string>24.ImportedFromIB2</string>
+-					<string>24.editorWindowContentRectSynchronizationRect</string>
+-					<string>244.IBEditorWindowLastContentRect</string>
+-					<string>244.IBWindowTemplateEditedContentRect</string>
+-					<string>244.ImportedFromIB2</string>
+-					<string>244.editorWindowContentRectSynchronizationRect</string>
+-					<string>244.windowTemplate.hasMaxSize</string>
+-					<string>244.windowTemplate.hasMinSize</string>
+-					<string>244.windowTemplate.maxSize</string>
+-					<string>244.windowTemplate.minSize</string>
+-					<string>245.IBPluginDependency</string>
+-					<string>245.ImportedFromIB2</string>
+-					<string>269.IBPluginDependency</string>
+-					<string>269.ImportedFromIB2</string>
+-					<string>270.IBEditorWindowLastContentRect</string>
+-					<string>270.IBPluginDependency</string>
+-					<string>270.ImportedFromIB2</string>
+-					<string>270.editorWindowContentRectSynchronizationRect</string>
+-					<string>272.IBPluginDependency</string>
+-					<string>272.ImportedFromIB2</string>
+-					<string>285.IBEditorWindowLastContentRect</string>
+-					<string>285.IBViewEditorWindowController.showingBoundsRectangles</string>
+-					<string>285.IBViewEditorWindowController.showingLayoutRectangles</string>
+-					<string>285.IBWindowTemplateEditedContentRect</string>
+-					<string>285.ImportedFromIB2</string>
+-					<string>285.editorWindowContentRectSynchronizationRect</string>
+-					<string>285.windowTemplate.hasMaxSize</string>
+-					<string>285.windowTemplate.hasMinSize</string>
+-					<string>285.windowTemplate.maxSize</string>
+-					<string>285.windowTemplate.minSize</string>
+-					<string>286.IBPluginDependency</string>
+-					<string>286.ImportedFromIB2</string>
+-					<string>29.IBEditorWindowLastContentRect</string>
+-					<string>29.IBPluginDependency</string>
+-					<string>29.ImportedFromIB2</string>
+-					<string>29.editorWindowContentRectSynchronizationRect</string>
+-					<string>292.IBPluginDependency</string>
+-					<string>292.ImportedFromIB2</string>
+-					<string>293.IBPluginDependency</string>
+-					<string>293.ImportedFromIB2</string>
+-					<string>295.IBPluginDependency</string>
+-					<string>295.ImportedFromIB2</string>
+-					<string>296.IBPluginDependency</string>
+-					<string>296.ImportedFromIB2</string>
+-					<string>297.IBPluginDependency</string>
+-					<string>297.ImportedFromIB2</string>
+-					<string>298.IBPluginDependency</string>
+-					<string>298.ImportedFromIB2</string>
+-					<string>300295.IBPluginDependency</string>
+-					<string>300295.IBShouldRemoveOnLegacySave</string>
+-					<string>300337.IBPluginDependency</string>
+-					<string>300337.ImportedFromIB2</string>
+-					<string>300338.IBPluginDependency</string>
+-					<string>300338.ImportedFromIB2</string>
+-					<string>300358.IBPluginDependency</string>
+-					<string>300358.ImportedFromIB2</string>
+-					<string>300359.IBPluginDependency</string>
+-					<string>300359.ImportedFromIB2</string>
+-					<string>300360.IBPluginDependency</string>
+-					<string>300361.IBPluginDependency</string>
+-					<string>300362.IBPluginDependency</string>
+-					<string>300362.ImportedFromIB2</string>
+-					<string>300363.IBPluginDependency</string>
+-					<string>300364.IBPluginDependency</string>
+-					<string>300364.ImportedFromIB2</string>
+-					<string>300365.IBPluginDependency</string>
+-					<string>300368.IBPluginDependency</string>
+-					<string>300368.ImportedFromIB2</string>
+-					<string>300369.IBPluginDependency</string>
+-					<string>300370.IBPluginDependency</string>
+-					<string>300370.ImportedFromIB2</string>
+-					<string>300371.IBPluginDependency</string>
+-					<string>300421.IBPluginDependency</string>
+-					<string>300421.ImportedFromIB2</string>
+-					<string>300422.IBPluginDependency</string>
+-					<string>300422.ImportedFromIB2</string>
+-					<string>300423.IBPluginDependency</string>
+-					<string>300423.ImportedFromIB2</string>
+-					<string>300424.IBPluginDependency</string>
+-					<string>300424.ImportedFromIB2</string>
+-					<string>300440.IBPluginDependency</string>
+-					<string>300441.IBPluginDependency</string>
+-					<string>300447.IBPluginDependency</string>
+-					<string>300447.ImportedFromIB2</string>
+-					<string>300450.IBPluginDependency</string>
+-					<string>300451.IBPluginDependency</string>
+-					<string>300451.ImportedFromIB2</string>
+-					<string>300452.IBPluginDependency</string>
+-					<string>300453.IBPluginDependency</string>
+-					<string>300453.ImportedFromIB2</string>
+-					<string>300454.IBPluginDependency</string>
+-					<string>300455.IBPluginDependency</string>
+-					<string>300455.ImportedFromIB2</string>
+-					<string>300456.IBPluginDependency</string>
+-					<string>300457.IBPluginDependency</string>
+-					<string>300457.ImportedFromIB2</string>
+-					<string>300458.IBPluginDependency</string>
+-					<string>300459.IBPluginDependency</string>
+-					<string>300459.ImportedFromIB2</string>
+-					<string>300460.IBPluginDependency</string>
+-					<string>300472.IBPluginDependency</string>
+-					<string>300472.ImportedFromIB2</string>
+-					<string>300473.IBPluginDependency</string>
+-					<string>305.IBPluginDependency</string>
+-					<string>305.ImportedFromIB2</string>
+-					<string>310.IBPluginDependency</string>
+-					<string>310.ImportedFromIB2</string>
+-					<string>348.IBPluginDependency</string>
+-					<string>348.ImportedFromIB2</string>
+-					<string>349.IBPluginDependency</string>
+-					<string>349.ImportedFromIB2</string>
+-					<string>350.IBPluginDependency</string>
+-					<string>350.ImportedFromIB2</string>
+-					<string>351.IBPluginDependency</string>
+-					<string>351.ImportedFromIB2</string>
+-					<string>352.IBPluginDependency</string>
+-					<string>352.ImportedFromIB2</string>
+-					<string>353.IBPluginDependency</string>
+-					<string>353.ImportedFromIB2</string>
+-					<string>354.IBPluginDependency</string>
+-					<string>354.ImportedFromIB2</string>
+-					<string>363.IBPluginDependency</string>
+-					<string>363.ImportedFromIB2</string>
+-					<string>364.IBPluginDependency</string>
+-					<string>364.ImportedFromIB2</string>
+-					<string>365.IBPluginDependency</string>
+-					<string>365.ImportedFromIB2</string>
+-					<string>368.IBPluginDependency</string>
+-					<string>368.ImportedFromIB2</string>
+-					<string>369.IBPluginDependency</string>
+-					<string>369.ImportedFromIB2</string>
+-					<string>370.IBPluginDependency</string>
+-					<string>370.ImportedFromIB2</string>
+-					<string>371.IBPluginDependency</string>
+-					<string>371.ImportedFromIB2</string>
+-					<string>372.IBPluginDependency</string>
+-					<string>372.ImportedFromIB2</string>
+-					<string>374.IBPluginDependency</string>
+-					<string>374.ImportedFromIB2</string>
+-					<string>375.IBPluginDependency</string>
+-					<string>375.ImportedFromIB2</string>
+-					<string>376.IBPluginDependency</string>
+-					<string>376.ImportedFromIB2</string>
+-					<string>377.IBPluginDependency</string>
+-					<string>377.ImportedFromIB2</string>
+-					<string>379.IBPluginDependency</string>
+-					<string>379.ImportedFromIB2</string>
+-					<string>380.IBPluginDependency</string>
+-					<string>380.ImportedFromIB2</string>
+-					<string>381.IBPluginDependency</string>
+-					<string>381.ImportedFromIB2</string>
+-					<string>382.IBPluginDependency</string>
+-					<string>382.ImportedFromIB2</string>
+-					<string>383.IBPluginDependency</string>
+-					<string>383.ImportedFromIB2</string>
+-					<string>384.IBPluginDependency</string>
+-					<string>384.ImportedFromIB2</string>
+-					<string>385.IBPluginDependency</string>
+-					<string>385.ImportedFromIB2</string>
+-					<string>386.IBPluginDependency</string>
+-					<string>386.ImportedFromIB2</string>
+-					<string>419.IBPluginDependency</string>
+-					<string>419.ImportedFromIB2</string>
+-					<string>420.IBPluginDependency</string>
+-					<string>420.ImportedFromIB2</string>
+-					<string>421.IBPluginDependency</string>
+-					<string>421.ImportedFromIB2</string>
+-					<string>423.IBPluginDependency</string>
+-					<string>423.ImportedFromIB2</string>
+-					<string>435.IBPluginDependency</string>
+-					<string>435.ImportedFromIB2</string>
+-					<string>5.IBPluginDependency</string>
+-					<string>5.ImportedFromIB2</string>
+-					<string>524.IBPluginDependency</string>
+-					<string>524.ImportedFromIB2</string>
+-					<string>526.IBPluginDependency</string>
+-					<string>526.ImportedFromIB2</string>
+-					<string>527.IBPluginDependency</string>
+-					<string>527.ImportedFromIB2</string>
+-					<string>532.IBPluginDependency</string>
+-					<string>532.ImportedFromIB2</string>
+-					<string>533.IBPluginDependency</string>
+-					<string>533.ImportedFromIB2</string>
+-					<string>535.IBPluginDependency</string>
+-					<string>535.ImportedFromIB2</string>
+-					<string>536.IBPluginDependency</string>
+-					<string>536.ImportedFromIB2</string>
+-					<string>537.IBPluginDependency</string>
+-					<string>537.ImportedFromIB2</string>
+-					<string>538.IBPluginDependency</string>
+-					<string>538.ImportedFromIB2</string>
+-					<string>541.IBPluginDependency</string>
+-					<string>541.ImportedFromIB2</string>
+-					<string>543.IBPluginDependency</string>
+-					<string>543.ImportedFromIB2</string>
+-					<string>544.IBPluginDependency</string>
+-					<string>544.ImportedFromIB2</string>
+-					<string>545.IBPluginDependency</string>
+-					<string>545.ImportedFromIB2</string>
+-					<string>56.IBPluginDependency</string>
+-					<string>56.ImportedFromIB2</string>
+-					<string>57.IBEditorWindowLastContentRect</string>
+-					<string>57.IBPluginDependency</string>
+-					<string>57.ImportedFromIB2</string>
+-					<string>57.editorWindowContentRectSynchronizationRect</string>
+-					<string>573.IBPluginDependency</string>
+-					<string>573.ImportedFromIB2</string>
+-					<string>574.IBPluginDependency</string>
+-					<string>574.ImportedFromIB2</string>
+-					<string>575.IBPluginDependency</string>
+-					<string>575.ImportedFromIB2</string>
+-					<string>58.IBPluginDependency</string>
+-					<string>58.ImportedFromIB2</string>
+-					<string>92.IBPluginDependency</string>
+-					<string>92.ImportedFromIB2</string>
+-				</object>
+-				<object class="NSMutableArray" key="dict.values">
+-					<bool key="EncodedWithXMLCoder">YES</bool>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<integer value="1" id="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>{{168, 821}, {113, 23}}</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>{{202, 626}, {154, 153}}</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>{{349, 868}, {315, 143}}</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>{{271, 666}, {301, 153}}</string>
+-					<string>{{437, 749}, {484, 308}}</string>
+-					<string>{{437, 749}, {484, 308}}</string>
+-					<reference ref="9"/>
+-					<string>{{184, 290}, {481, 345}}</string>
+-					<integer value="0" id="8"/>
+-					<reference ref="9"/>
+-					<string>{3.40282e+38, 3.40282e+38}</string>
+-					<string>{320, 240}</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>{{58, 803}, {155, 33}}</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>{{100, 746}, {155, 33}}</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>{{68, 585}, {454, 271}}</string>
+-					<reference ref="9"/>
+-					<reference ref="9"/>
+-					<string>{{68, 585}, {454, 271}}</string>
+-					<reference ref="9"/>
+-					<string>{{433, 406}, {486, 327}}</string>
+-					<reference ref="8"/>
+-					<reference ref="9"/>
+-					<string>{3.40282e+38, 3.40282e+38}</string>
+-					<string>{320, 240}</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>{{145, 1011}, {336, 20}}</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>{{67, 819}, {336, 20}}</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>{{20, 641}, {218, 203}}</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>{{79, 616}, {218, 203}}</string>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+-					<reference ref="9"/>
+-				</object>
+-			</object>
+-			<object class="NSMutableDictionary" key="unlocalizedProperties">
+-				<bool key="EncodedWithXMLCoder">YES</bool>
+-				<object class="NSArray" key="dict.sortedKeys">
+-					<bool key="EncodedWithXMLCoder">YES</bool>
+-				</object>
+-				<object class="NSMutableArray" key="dict.values">
+-					<bool key="EncodedWithXMLCoder">YES</bool>
+-				</object>
++					<object class="IBObjectRecord">
++						<int key="objectID">300476</int>
++						<reference key="object" ref="278155937"/>
++						<array class="NSMutableArray" key="children">
++							<reference ref="617441821"/>
++						</array>
++						<reference key="parent" ref="596750588"/>
++					</object>
++					<object class="IBObjectRecord">
++						<int key="objectID">300477</int>
++						<reference key="object" ref="406291430"/>
++						<array class="NSMutableArray" key="children">
++							<reference ref="67728988"/>
++						</array>
++						<reference key="parent" ref="596750588"/>
++					</object>
++					<object class="IBObjectRecord">
++						<int key="objectID">300478</int>
++						<reference key="object" ref="67728988"/>
++						<reference key="parent" ref="406291430"/>
++					</object>
++					<object class="IBObjectRecord">
++						<int key="objectID">300479</int>
++						<reference key="object" ref="617441821"/>
++						<reference key="parent" ref="278155937"/>
++					</object>
++				</array>
+ 			</object>
++			<dictionary class="NSMutableDictionary" key="flattenedProperties">
++				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="-3.ImportedFromIB2"/>
++				<string key="100292.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<string key="100293.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<string key="100295.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="100295.IBShouldRemoveOnLegacySave"/>
++				<string key="100310.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<string key="100363.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<string key="100364.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<string key="100365.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<string key="100368.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<string key="100369.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<string key="100370.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<string key="100371.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<string key="100372.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<string key="100374.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<string key="100375.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<string key="100376.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<string key="100377.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<string key="100379.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<string key="100382.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<string key="100385.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<string key="100386.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<string key="100541.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<string key="100543.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<string key="129.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="129.ImportedFromIB2"/>
++				<string key="130.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="130.ImportedFromIB2"/>
++				<string key="131.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="131.ImportedFromIB2"/>
++				<string key="134.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="134.ImportedFromIB2"/>
++				<string key="136.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="136.ImportedFromIB2"/>
++				<string key="143.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="143.ImportedFromIB2"/>
++				<string key="144.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="144.ImportedFromIB2"/>
++				<string key="145.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="145.ImportedFromIB2"/>
++				<string key="149.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="149.ImportedFromIB2"/>
++				<string key="150.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="150.ImportedFromIB2"/>
++				<string key="157.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="157.ImportedFromIB2"/>
++				<string key="163.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="163.ImportedFromIB2"/>
++				<string key="169.IBEditorWindowLastContentRect">{{168, 821}, {113, 23}}</string>
++				<string key="169.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="169.ImportedFromIB2"/>
++				<string key="169.editorWindowContentRectSynchronizationRect">{{202, 626}, {154, 153}}</string>
++				<string key="19.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="19.ImportedFromIB2"/>
++				<integer value="1" key="196.ImportedFromIB2"/>
++				<string key="200295.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="200295.IBShouldRemoveOnLegacySave"/>
++				<string key="203.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="203.ImportedFromIB2"/>
++				<string key="204.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="204.ImportedFromIB2"/>
++				<string key="23.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="23.ImportedFromIB2"/>
++				<string key="24.IBEditorWindowLastContentRect">{{349, 868}, {315, 143}}</string>
++				<string key="24.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="24.ImportedFromIB2"/>
++				<string key="24.editorWindowContentRectSynchronizationRect">{{271, 666}, {301, 153}}</string>
++				<string key="244.IBEditorWindowLastContentRect">{{507, 565}, {484, 308}}</string>
++				<string key="244.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<string key="244.IBWindowTemplateEditedContentRect">{{507, 565}, {484, 308}}</string>
++				<integer value="1" key="244.ImportedFromIB2"/>
++				<string key="244.editorWindowContentRectSynchronizationRect">{{184, 290}, {481, 345}}</string>
++				<integer value="0" key="244.windowTemplate.hasMaxSize"/>
++				<integer value="1" key="244.windowTemplate.hasMinSize"/>
++				<string key="244.windowTemplate.maxSize">{3.40282e+38, 3.40282e+38}</string>
++				<string key="244.windowTemplate.minSize">{320, 240}</string>
++				<string key="245.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="245.ImportedFromIB2"/>
++				<string key="269.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="269.ImportedFromIB2"/>
++				<string key="270.IBEditorWindowLastContentRect">{{58, 803}, {155, 33}}</string>
++				<string key="270.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="270.ImportedFromIB2"/>
++				<string key="270.editorWindowContentRectSynchronizationRect">{{100, 746}, {155, 33}}</string>
++				<string key="272.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="272.ImportedFromIB2"/>
++				<string key="285.IBEditorWindowLastContentRect">{{68, 585}, {454, 271}}</string>
++				<string key="285.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="285.IBViewEditorWindowController.showingBoundsRectangles"/>
++				<integer value="1" key="285.IBViewEditorWindowController.showingLayoutRectangles"/>
++				<string key="285.IBWindowTemplateEditedContentRect">{{68, 585}, {454, 271}}</string>
++				<integer value="1" key="285.ImportedFromIB2"/>
++				<string key="285.editorWindowContentRectSynchronizationRect">{{433, 406}, {486, 327}}</string>
++				<integer value="0" key="285.windowTemplate.hasMaxSize"/>
++				<integer value="1" key="285.windowTemplate.hasMinSize"/>
++				<string key="285.windowTemplate.maxSize">{3.40282e+38, 3.40282e+38}</string>
++				<string key="285.windowTemplate.minSize">{320, 240}</string>
++				<string key="286.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="286.ImportedFromIB2"/>
++				<string key="29.IBEditorWindowLastContentRect">{{145, 1011}, {336, 20}}</string>
++				<string key="29.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="29.ImportedFromIB2"/>
++				<string key="29.editorWindowContentRectSynchronizationRect">{{67, 819}, {336, 20}}</string>
++				<string key="292.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="292.ImportedFromIB2"/>
++				<string key="293.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="293.ImportedFromIB2"/>
++				<string key="295.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="295.ImportedFromIB2"/>
++				<string key="296.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="296.ImportedFromIB2"/>
++				<string key="297.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="297.ImportedFromIB2"/>
++				<string key="298.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="298.ImportedFromIB2"/>
++				<string key="300295.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="300295.IBShouldRemoveOnLegacySave"/>
++				<string key="300337.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="300337.ImportedFromIB2"/>
++				<string key="300338.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="300338.ImportedFromIB2"/>
++				<string key="300358.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="300358.ImportedFromIB2"/>
++				<string key="300359.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="300359.ImportedFromIB2"/>
++				<string key="300360.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<string key="300361.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<string key="300362.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="300362.ImportedFromIB2"/>
++				<string key="300363.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<string key="300364.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="300364.ImportedFromIB2"/>
++				<string key="300365.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<string key="300368.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="300368.ImportedFromIB2"/>
++				<string key="300369.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<string key="300370.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="300370.ImportedFromIB2"/>
++				<string key="300371.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<string key="300421.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="300421.ImportedFromIB2"/>
++				<string key="300422.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="300422.ImportedFromIB2"/>
++				<string key="300423.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="300423.ImportedFromIB2"/>
++				<string key="300424.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="300424.ImportedFromIB2"/>
++				<string key="300440.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<string key="300441.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<string key="300447.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="300447.ImportedFromIB2"/>
++				<string key="300450.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<string key="300451.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="300451.ImportedFromIB2"/>
++				<string key="300452.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<string key="300453.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="300453.ImportedFromIB2"/>
++				<string key="300454.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<string key="300455.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="300455.ImportedFromIB2"/>
++				<string key="300456.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<string key="300457.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="300457.ImportedFromIB2"/>
++				<string key="300458.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<string key="300459.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="300459.ImportedFromIB2"/>
++				<string key="300460.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<string key="300472.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="300472.ImportedFromIB2"/>
++				<string key="300473.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<string key="300476.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="300476.ImportedFromIB2"/>
++				<string key="300477.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="300477.ImportedFromIB2"/>
++				<string key="300478.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<string key="300479.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<string key="305.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="305.ImportedFromIB2"/>
++				<string key="310.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="310.ImportedFromIB2"/>
++				<string key="348.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="348.ImportedFromIB2"/>
++				<string key="349.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="349.ImportedFromIB2"/>
++				<string key="350.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="350.ImportedFromIB2"/>
++				<string key="351.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="351.ImportedFromIB2"/>
++				<string key="352.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="352.ImportedFromIB2"/>
++				<string key="353.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="353.ImportedFromIB2"/>
++				<string key="354.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="354.ImportedFromIB2"/>
++				<string key="363.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="363.ImportedFromIB2"/>
++				<string key="364.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="364.ImportedFromIB2"/>
++				<string key="365.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="365.ImportedFromIB2"/>
++				<string key="368.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="368.ImportedFromIB2"/>
++				<string key="369.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="369.ImportedFromIB2"/>
++				<string key="370.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="370.ImportedFromIB2"/>
++				<string key="371.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="371.ImportedFromIB2"/>
++				<string key="372.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="372.ImportedFromIB2"/>
++				<string key="374.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="374.ImportedFromIB2"/>
++				<string key="375.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="375.ImportedFromIB2"/>
++				<string key="376.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="376.ImportedFromIB2"/>
++				<string key="377.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="377.ImportedFromIB2"/>
++				<string key="379.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="379.ImportedFromIB2"/>
++				<string key="380.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="380.ImportedFromIB2"/>
++				<string key="381.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="381.ImportedFromIB2"/>
++				<string key="382.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="382.ImportedFromIB2"/>
++				<string key="383.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="383.ImportedFromIB2"/>
++				<string key="384.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="384.ImportedFromIB2"/>
++				<string key="385.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="385.ImportedFromIB2"/>
++				<string key="386.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="386.ImportedFromIB2"/>
++				<string key="419.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="419.ImportedFromIB2"/>
++				<string key="420.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="420.ImportedFromIB2"/>
++				<string key="421.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="421.ImportedFromIB2"/>
++				<string key="423.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="423.ImportedFromIB2"/>
++				<string key="435.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="435.ImportedFromIB2"/>
++				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="5.ImportedFromIB2"/>
++				<string key="524.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="524.ImportedFromIB2"/>
++				<string key="526.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="526.ImportedFromIB2"/>
++				<string key="527.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="527.ImportedFromIB2"/>
++				<string key="532.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="532.ImportedFromIB2"/>
++				<string key="533.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="533.ImportedFromIB2"/>
++				<string key="535.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="535.ImportedFromIB2"/>
++				<string key="536.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="536.ImportedFromIB2"/>
++				<string key="537.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="537.ImportedFromIB2"/>
++				<string key="538.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="538.ImportedFromIB2"/>
++				<string key="541.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="541.ImportedFromIB2"/>
++				<string key="543.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="543.ImportedFromIB2"/>
++				<string key="544.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="544.ImportedFromIB2"/>
++				<string key="545.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="545.ImportedFromIB2"/>
++				<string key="56.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="56.ImportedFromIB2"/>
++				<string key="57.IBEditorWindowLastContentRect">{{20, 641}, {218, 203}}</string>
++				<string key="57.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="57.ImportedFromIB2"/>
++				<string key="57.editorWindowContentRectSynchronizationRect">{{79, 616}, {218, 203}}</string>
++				<string key="573.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="573.ImportedFromIB2"/>
++				<string key="574.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="574.ImportedFromIB2"/>
++				<string key="575.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="575.ImportedFromIB2"/>
++				<string key="58.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="58.ImportedFromIB2"/>
++				<string key="92.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
++				<integer value="1" key="92.ImportedFromIB2"/>
++			</dictionary>
++			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+ 			<nil key="activeLocalization"/>
+-			<object class="NSMutableDictionary" key="localizations">
+-				<bool key="EncodedWithXMLCoder">YES</bool>
+-				<object class="NSArray" key="dict.sortedKeys">
+-					<bool key="EncodedWithXMLCoder">YES</bool>
+-				</object>
+-				<object class="NSMutableArray" key="dict.values">
+-					<bool key="EncodedWithXMLCoder">YES</bool>
+-				</object>
+-			</object>
++			<dictionary class="NSMutableDictionary" key="localizations"/>
+ 			<nil key="sourceID"/>
+-			<int key="maxID">300475</int>
++			<int key="maxID">300481</int>
+ 		</object>
+ 		<object class="IBClassDescriber" key="IBDocument.Classes">
+-			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
+-				<bool key="EncodedWithXMLCoder">YES</bool>
++			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+ 				<object class="IBPartialClassDescription">
+ 					<string key="className">FirstResponder</string>
+ 					<string key="superclassName">NSObject</string>
+@@ -3879,131 +3558,81 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+ 						<string key="minorKey"/>
+ 					</object>
+ 				</object>
+-			</object>
+-			<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+">
+-				<bool key="EncodedWithXMLCoder">YES</bool>
++			</array>
++			<array class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+">
+ 				<object class="IBPartialClassDescription">
+ 					<string key="className">X11Controller</string>
+ 					<string key="superclassName">NSObject</string>
+-					<object class="NSMutableDictionary" key="actions">
+-						<bool key="EncodedWithXMLCoder">YES</bool>
+-						<object class="NSMutableArray" key="dict.sortedKeys">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
+-							<string>apps_table_delete:</string>
+-							<string>apps_table_done:</string>
+-							<string>apps_table_duplicate:</string>
+-							<string>apps_table_new:</string>
+-							<string>apps_table_show:</string>
+-							<string>bring_to_front:</string>
+-							<string>close_window:</string>
+-							<string>enable_fullscreen_changed:</string>
+-							<string>minimize_window:</string>
+-							<string>next_window:</string>
+-							<string>prefs_changed:</string>
+-							<string>prefs_show:</string>
+-							<string>previous_window:</string>
+-							<string>quit:</string>
+-							<string>toggle_fullscreen:</string>
+-							<string>x11_help:</string>
+-							<string>zoom_window:</string>
+-						</object>
+-						<object class="NSMutableArray" key="dict.values">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
+-							<string>id</string>
+-							<string>id</string>
+-							<string>id</string>
+-							<string>id</string>
+-							<string>id</string>
+-							<string>id</string>
+-							<string>id</string>
+-							<string>id</string>
+-							<string>id</string>
+-							<string>id</string>
+-							<string>id</string>
+-							<string>id</string>
+-							<string>id</string>
+-							<string>id</string>
+-							<string>id</string>
+-							<string>id</string>
+-							<string>id</string>
+-						</object>
+-					</object>
+-					<object class="NSMutableDictionary" key="outlets">
+-						<bool key="EncodedWithXMLCoder">YES</bool>
+-						<object class="NSMutableArray" key="dict.sortedKeys">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
+-							<string>apps_separator</string>
+-							<string>apps_table</string>
+-							<string>click_through</string>
+-							<string>copy_menu_item</string>
+-							<string>depth</string>
+-							<string>dock_apps_menu</string>
+-							<string>dock_menu</string>
+-							<string>dock_window_separator</string>
+-							<string>enable_auth</string>
+-							<string>enable_fullscreen</string>
+-							<string>enable_fullscreen_menu</string>
+-							<string>enable_keyequivs</string>
+-							<string>enable_tcp</string>
+-							<string>fake_buttons</string>
+-							<string>focus_follows_mouse</string>
+-							<string>focus_on_new_window</string>
+-							<string>prefs_panel</string>
+-							<string>sync_clipboard_to_pasteboard</string>
+-							<string>sync_keymap</string>
+-							<string>sync_pasteboard</string>
+-							<string>sync_pasteboard_to_clipboard</string>
+-							<string>sync_pasteboard_to_primary</string>
+-							<string>sync_primary_immediately</string>
+-							<string>sync_text1</string>
+-							<string>sync_text2</string>
+-							<string>toggle_fullscreen_item</string>
+-							<string>use_sysbeep</string>
+-							<string>window_separator</string>
+-							<string>x11_about_item</string>
+-						</object>
+-						<object class="NSMutableArray" key="dict.values">
+-							<bool key="EncodedWithXMLCoder">YES</bool>
+-							<string>NSMenuItem</string>
+-							<string>NSTableView</string>
+-							<string>NSButton</string>
+-							<string>NSMenuItem</string>
+-							<string>NSPopUpButton</string>
+-							<string>NSMenu</string>
+-							<string>NSMenu</string>
+-							<string>NSMenuItem</string>
+-							<string>NSButton</string>
+-							<string>NSButton</string>
+-							<string>NSButton</string>
+-							<string>NSButton</string>
+-							<string>NSButton</string>
+-							<string>NSButton</string>
+-							<string>NSButton</string>
+-							<string>NSButton</string>
+-							<string>NSPanel</string>
+-							<string>NSButton</string>
+-							<string>NSButton</string>
+-							<string>NSButton</string>
+-							<string>NSButton</string>
+-							<string>NSButton</string>
+-							<string>NSButton</string>
+-							<string>NSTextField</string>
+-							<string>NSTextField</string>
+-							<string>NSMenuItem</string>
+-							<string>NSButton</string>
+-							<string>NSMenuItem</string>
+-							<string>NSMenuItem</string>
+-						</object>
+-					</object>
++					<dictionary class="NSMutableDictionary" key="actions">
++						<string key="apps_table_delete:">id</string>
++						<string key="apps_table_done:">id</string>
++						<string key="apps_table_duplicate:">id</string>
++						<string key="apps_table_new:">id</string>
++						<string key="apps_table_show:">id</string>
++						<string key="bring_to_front:">id</string>
++						<string key="close_window:">id</string>
++						<string key="enable_fullscreen_changed:">id</string>
++						<string key="minimize_window:">id</string>
++						<string key="next_window:">id</string>
++						<string key="prefs_changed:">id</string>
++						<string key="prefs_show:">id</string>
++						<string key="previous_window:">id</string>
++						<string key="quit:">id</string>
++						<string key="toggle_fullscreen:">id</string>
++						<string key="x11_help:">id</string>
++						<string key="zoom_window:">id</string>
++					</dictionary>
++					<dictionary class="NSMutableDictionary" key="outlets">
++						<string key="apps_separator">NSMenuItem</string>
++						<string key="apps_table">NSTableView</string>
++						<string key="click_through">NSButton</string>
++						<string key="copy_menu_item">NSMenuItem</string>
++						<string key="depth">NSPopUpButton</string>
++						<string key="dock_apps_menu">NSMenu</string>
++						<string key="dock_menu">NSMenu</string>
++						<string key="dock_window_separator">NSMenuItem</string>
++						<string key="enable_auth">NSButton</string>
++						<string key="enable_fullscreen">NSButton</string>
++						<string key="enable_fullscreen_menu">NSButton</string>
++						<string key="enable_keyequivs">NSButton</string>
++						<string key="enable_tcp">NSButton</string>
++						<string key="fake_buttons">NSButton</string>
++						<string key="focus_follows_mouse">NSButton</string>
++						<string key="focus_on_new_window">NSButton</string>
++						<string key="option_sends_alt">NSButton</string>
++						<string key="prefs_panel">NSPanel</string>
++						<string key="sync_clipboard_to_pasteboard">NSButton</string>
++						<string key="sync_keymap">NSButton</string>
++						<string key="sync_pasteboard">NSButton</string>
++						<string key="sync_pasteboard_to_clipboard">NSButton</string>
++						<string key="sync_pasteboard_to_primary">NSButton</string>
++						<string key="sync_primary_immediately">NSButton</string>
++						<string key="sync_text1">NSTextField</string>
++						<string key="sync_text2">NSTextField</string>
++						<string key="toggle_fullscreen_item">NSMenuItem</string>
++						<string key="use_sysbeep">NSButton</string>
++						<string key="window_separator">NSMenuItem</string>
++						<string key="x11_about_item">NSMenuItem</string>
++					</dictionary>
+ 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+ 						<string key="majorKey">IBDocumentRelativeSource</string>
+ 						<string key="minorKey">../../../X11Controller.h</string>
+ 					</object>
+ 				</object>
+-			</object>
++			</array>
+ 		</object>
+ 		<int key="IBDocument.localizationMode">0</int>
++		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
++		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
++			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
++			<integer value="1040" key="NS.object.0"/>
++		</object>
++		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+ 		<string key="IBDocument.LastKnownRelativeProjectPath">../X11.xcodeproj</string>
+ 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
++		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
++			<string key="NSMenuCheckmark">{9, 8}</string>
++			<string key="NSMenuMixedState">{7, 2}</string>
++		</dictionary>
+ 	</data>
+ </archive>
+diff --git xorg-server-1.8.0/hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects.nib xorg-server-1.8.0/hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects.nib
+index fee8f1ce92ee490db5abf22339c574c4e9205fb4..888424dfca546c65d2eb01232818b617bbac860f 100644
+GIT binary patch
+literal 45258
+zcmdRX2Ygh;_VAsVTX%2U^pLgzM7ktED53Y>LT_P7HU*Mw%qA2OxuaAYq9Te7DHa5K
+z$A+TVzz!myV#9*Hqr!LQ-rZz3S>EHl|Np)3`{0+|yZ25x=ggVY=FHr=)fMHz+D at I`
+z;Sh&8!ttEIiDq}R$JCY!{58SyK-JWifw}YiMYX|cEqygbW#w>tV$0e<bsUFQZo1b)
+z9^)iV<~ndWTvx6a*O%+Z4dRAz>$n at Zo4A{~Te!{K9o)U#ecZ#`OWe!ce(rVd4eo93
+zAom`3nEQhJlKYDLmivi2g(M^+6&c7xiKrP$LoHB8bRO!2x}rg76dH{tqbX=ADneB#
+zfT~d)T7;IM3(+cc6<UX`MmM87(OqaedJsK?o<`50SJ2z&9rP|bfR3S$(dX!E^eZ}z
+zIqb$N*02XB;!K={y|^82k2~O8+!go3!|@0_5>LdF at MK(w=ivFc7T4hgcp0`Z#h2st
+z_&U4+Z^m2jR(vPkfgi??;79Re_$mA}eja~|PZN&FB#y+BRFXwHlP;t?=|jeo*`$z^
+zkWw;_1V{~8LM|jriA7eCb>wQYfovqVl1*eQxr5wK9w$$b=gB_uE;&FBlOyCfIYE9P
+zKayX_N%AKrkyAY3d0ye;_!K^s at 4$EDbNSAE9-q(m;rsG~_`&=LegZ$0pT<}7b^IcJ
+z3BQ`ZoWFv<l3&MP&u`_o at wf92@DK72 at z3(R`RDkT_*ePY_&52t_=Eg={89b`{uBOd
+z{s;a?{uF;&-~>U?1YKw*qzUOlw$MgsE942?gziFbVW=>clZ0`?OktKVTPPCd3l+j5
+zVX<(5uuNDjtP$1=*9jYhn}n^xHsOBZ0pUU6G2vNZx3EvxFT5_iBODbz5WW(=7ETC1
+zh?=O2hG>fMVuF|`W{BBhu9zqG7e|OA#fjo1ak at A|oGq4$W#ai_jkrX-P+TFd6xWJZ
+zi8qNii?@q+i1&&2iw}qoi4TiUiF?IY#8<`F#RK9Y at l)}H_>K67cv8X=kyJ^O5~U<5
+zOY%ysr8ZKo)LF`xdP#$&A<|H3m^4<JAWfBur1?^Xv`AVkQR!moGU;;ZT4}v>o3vTl
+zF5N9XDm^AWEA5u{N&BS((n0AH=~L;1^o{hZ^qX{A=43^7$!=Md<K-kdOFma_E$7I&
+za!)y59wZNzN6Ta6De_c#nmk>eBbUk5^7--w@)G$HdAWRre5HJyyg}Y1-zIOCx5#&J
+zl6<Fpm%LrRTizkxE8izSEI%UelAn}!%g at Ps<(K4r at _zYk`5pO?{J#95{E_^b{JH$K
+zd_w*~{!#u-{$2h{K?+tRMOHLLSK^ffB~@vrWGP<d9Ho`gR%xenQgW0$rJK at A8KjI*
+zMk-U4Y07M+P?@Xvl at evX5>#pxs$8tBP*y8zlq;3B%C*W(%FW7l<!<F3<$mP><x%A^
+z<tgPkWv}v@@}_b?IjkH}jwzoj$CVSxH_DI7Ps;DgAId2gamg;t73WHJrMt3Stz7L~
+z?OiXr_PO459df<zI_f&^`oi_4>xAnU*RQUVu0LIWxlX$|x8XM39(RH}(VgT at cBi;g
+z-Obz??o7AW{e(J6{a*b+{Zai%{aO7*{Z;)<{ayV-J*obw{-yq{o>EV1oQ5>45slXb
+zP1Gb!))dX9xiwYOG+i?^Q}bwXTD+E^C2C1pvX-KyYR$AXEnUmdGPNwtt7U7=wH8`S
+z?HsL at cCOZ1YooQ*+G*{z4q8X;Jgt+KqvdLywJus$El=yFb=P`mJ+*wTm)2YBqxIGL
+zY5lbU+CXiPHdq^?4b_He!?h9GNNtohS{tK{)y8S#wFz2*Hc^|TP1dGpQ?+T at bZv$<
+zQ=6sD)(W*bnopan6=}tqUn|i{wKA<-o2Sj!Dzr+iN(*S!+WA_I7Sw9BI&FcrP+O!e
+z)-KSNXcuZrwTrZ6nx#?gV(k)bxwb-Esjbm2*DH-N##m#VG2WP96c`hYNycPjiZRug
+zW=uC`7&DDo#%!a|m}B^ixkiyuZ1{~5qtqxf%8hx(e51msG^&h%QEi-W)EGgd)~GWU
+z7z>R>#$w|FV~KI0vDCQ8SY}uTH7+(TF_s%EjFrYJW3{oyxYW4JxZJqHxYAf_TxF~?
+zt~RbQt~J&h*BKj(>x~<XjmC|}O~%c}Eyk_JCgV0^v$4h4YHTxZH|{X*H10CC8+RK!
+zjGe|k#=XXU#{I?v#)HN~#>2)V#-qk##^c5l#xCPY<0<25;~C>wW4G~~@w~Cec)@tl
+z*lWCGyllK;ylT8=>@)TouN!X|ZyIkIZyWCz?-~b;gT{NtA>)1HuyMpVYJ6aPXnbTG
+zGd?yxF+MduGd?$t8($b-8ebV-8z+o!jBkzajPH#fj314kjGv8Pj9-o4jNgqvjFZNn
+z#$U$Y#wp{p$(hK+CNX(aFhx@`Wm7R-rrT6a&D2f9G)<2gXU3ZeW}=y7CYvc{s at cp;
+zGt<osGt<m6y=J!A+-zaCG|w?xndh3V%{FFRvz^)AJkQKEyH09ZRaa5*p&7?1oQrdF
+zDyMNeXK*Ix;o`V>E`dwrlDK3pg-hj{acNvSm%(LnS)7;4=9+UYxR%^GTr2Ket~J+&
+zYs<Cc+83J1V+#5g75Rg~^10;|<+Y2)mKO&{`WFWaO><1a<Z`%O;h$1oRUB9toHeFk
+ztYZ&21&lET11o&Npg%a-S5fB=&KOfLq{dh2Ul^#FKY2{Sgg~IS&`gcdzEd2U3sq;$
+z&4k9GYv<AAmPM at LX=4h;_!rf}{prqAR*+Q-R8 at gl0u~B at 2~dQfs)u3>01-l>ardFB
+zfg0A%kU&-KXkV4D)L#R?>{?D6lss%n6sJ-Awk3iEKpvs^EsEcz<k2{eU;jMC?^p`O
+zJt*!;$wL-LasFE{03EsWxK2O?8!gtHC0K+#$mKe7T>zVo!P=Vgs#1%G?)q1Q{Z-^+
+zSiHsMaoxD?T#xAv-c?X_s&nagFdSW1>w|$Pu&Zx at qCL6%sbdP9-*Dkjz-gy9*Jn1s
+zP#3HXR66%JbG^BI7|`JZ1_p`(zWPC8p!Mela07w79RtqLTJk2RnZeu;7?W_v{@N|v
+zU~VXvKM8vE*E%(ab0e&l_nJevk=!V5G&hDD%Z=m4a}&4%ZX!2{o6Jq&rgGD`>D&x%
+zCO3<l%@uNUI3G8cE8>bdKUcz)a%EgOH;<doRdAJD6&K*Dx%0UiF38n#b=(4OA-9NI
+z%w51O;V$Hsau;#SIG{CmF?R{KoLj-I<W_O3xi#FS+-2P5+!frF+*<A`%VinXxz;j^
+zT8~=KTQ682TF0zUtk0|y){oZj6mb-Z6sZ)&QItYaCPfcY^e{z_QuH`QyC`~!qGu at D
+zP0{ldy+F}kie9GZHH!9A^ae$5QS=T)2Pk at vqW38}LeU2leMHgM6#YceFBJVv(P at f-
+zBM`-4IueR`iUo>+on(q#6sr{L6q^)#D2}5zp5g?G6DdxjIGN%Uic{Z#VY!;ShP#$q
+z&t1oD;Jj1D6pZrC^;ZDb4DttS%d2dzVdEdDt10qZx}{le3x`?oMqoR2*3_IFVD{RY
+zKt+YWW@@p&!e8pE^*dvGE4Qi8OaPWIpF6g$w!&XqKP|R!w{o{}`M^N%tp08!L|eIS
+zoEN%mWtkR!hr1Jiy^Gt<-OcUbc5?Rs_mB2h)eW!pR|Y`_ut@;WPb`N{tT^i&E5Y(i
+zWCg+u^nlfJGxs3(kQHyGzt26wJ<2`CJq}Gi!R_Ln<eq|tpXQ!{9(QxkLGydy|BKvC
+z#+T)b{Kdm7Vd at r|o-qX=7zUqTSH56$pm?+|$fOVJ1ZLdWD!ULcc(@1<ad@!6U+t^$
+z)dp&yso}vv<v}*Pis8}dDt~35s=R1apvX#%1HsAxnu%7Lm7pkb%TAv at Z6%C*8{m5d
+zCi|=0YurAd)C7Of9tV5Ir&!5W5}+J{4Wtu;WMG-UXnv)yX1+uJH at UZL`RYv4aQ)5P
+zn_PZF<L`3&tQ4!6m1GxXt=LEx)YcE<A?|%Zj6GrW-pn21^55r<01c1UQ}HRF>2~e|
+z?nCaQdMbVfG(8U7)87`MK%|1Yxs}j}mFXay6-L=XIMvFS86m8Kvx81?r+Uw~Z5G(h
+zeGLq7-15R0XM_j$dp5W~a6ekvR`W9r?k at mX!{GkK?F^GWs}b4Xi{K3htJC4Ci07V0
+zVi<UPw8Egbn8ytSQNjdD07OhV2ot}zl|2ebK`t1*kc8`BQ{!8_1 at 5`Id>B6ar&CNr
+zdWfGkBMroEaiC~Eqj|)nKyfJEo)i~Zts^D{O5%2)6qIVU1*$By+DskoE3aZzLj*z@
+zR?BTD6J;SU%0|ttcGehck~Pa(5OWk!OLPuu1s&PsLhS(O4ps*T>yFTG6yEI%VE#86
+zsrt!^asaN*Q2RW9YqZrq3{E$z<qp&x^*}vQKI(;fqdurF>WBKH0cfDr$;!35T6tD)
+ztB=*+8ek2!hFZg|5eK7L4Ydk^HypqlX?2W-DrZ{%xq-S`FTmDhIMEoVE}DP}pzfqF
+zVhpV=;o<B&dt8mb#9!mD0+Xd<$ByIMpMkH?^e`k$Xdqt$Uxh%bpU$yqU5xywB-{j=
+z4**qK-5rp6G{&mi)B=Caf^vZ9j08U)2p&YWRz48Cm(`OI9Bcx#(BkXsh6mvSt0f3$
+zqmb!Yr&Y!=XF~I$FpM^uE6$8&Q+lrs(fe|A1)#S!4y;Blgj&Baz55oLaT5cjr4 at ef
+z5U at PG1w}P}f7N*3nZUU=3Y;6y49+2ROXK;BZbh3yAZ<n40Hiy>)|lukHQPqA!k{o{
+z1E&rvFZMH58ei5Fxx4FIx(`}<AQHLy7KY5QTNqng2H~z)06mNz3FCuyK{HQ9gOU&i
+zW!Th$vcN)b|B8w;(PekI9ebEwIx}6GV)AMTlh at H30K!|5v=|izVC2;Cb>;T78h`#w
+z;2b8d{SMp2PzUHBdJi3{7bG7rbzqHk8XnhJkYqIC>5#ZbpV;DlJn(Z^+ at mi*+ at mki
+zSJnip;7o-01|4b;_vq&aLX7)o;vW4Lu8RHwLYxZ28zuH8&U932`2~KE4l$=TMi^rf
+z#vaSu)7WKAaax<&82iZ+2N##u#wG#QxgAh-8jxUeX!7ECtL1Gt!J6J=7;zFN3~}5H
+zr$LVy;r<x(GsD9;W8%O-_2ThGvEk0f&2fu*xLZRjZLLD5ojHx+o;}&|*&0D!uK{pJ
+zfV~sWvE~Bwb(SwAkZ>1^57i7~1UlhP+#UD8J#jwng?r;ZxUW at Ym00E0e5=9=ST$C#
+zDYpG_3me<PcnH8bEDR;X)*r^Uc+$X%K+r#aVbkiPLe<CN at ld@WvU*v#dg;{B<yGaC
+zFw)~Io3=2;X at T2`XF?0JBU`ASw(}-V4+JXDz^Qm{xCJ(4ad`u$&iQAYiYr3kSL5 at c
+z^B{DNWXq{m6$Zbu&`cb-xCjL6#Il+|U1^y&<YkYa(-fP9p$3=W3!%Y_;<z~E3N?6s
+zxWVc|Gh>3EMehCH*bQHFCR8tpLiN&r1=TCURq at pT*|jn03{il%0nG1Z64F~6 at D8Z~
+z$7D9hsSwI%lvMb7d;{KC&-1rJ7q?l9oK6-u=J|yahxse28*zL{T;XlN at 3&bO0Jkp;
+zbM|&NSMRo#G$r>=ywMR-_yOqgp>TgulIFsxpn1Hk#~FY~*sz;e8EqKiC(xJN2Jn_F
+z5Q^^EzUt~=VKD4_L>Q3xS-jgW_lR||<^Ir2!h7%w_(i-Izl2}LuW)hrRs0&>hxg;x
+z at f-L}{1$#2zk}b!2k=4s9zKNM$A|F|d=!5Ge;?wH at G<-`{se!DKf|BHuP=aszk=r{
+zxIN(*O##dsZ~+z!sqmFThylVR0|OOxl~w)gz$x+v%P)Z8DyUst0qzyJFf0lKUP^VK
+zs at PvsXl8*QTH`A%Wo2y7hxuGX0ySd-Rp2-IDr}c*fUjtNDR6dGF|-_jS}mA12RCbS
+zxqo4}dW1V`_Xh6Fppd5up4l+J5Bg)}3(XX8sj6!I;O<sb6jb|)pzmS+^3t+ez-U5X
+zp>qws%)~HC>1P1ah7cMb7^tao8iyZ)e6>CY6=-f~O}PUzG&i`)_6+SfS>yhvlo!{Q
+zLHUBZYG$eV7lJooW9X0)$QlQ#xS|3=XA>7!`wIZEqFQUY2Z21WE-^Xl7VBZ_A!|j8
+zew_2KMZX;9B5p!Ii;D+u)Bb0zfl~J?E&9pMQ|l7z3gvzL9sVBwfPch40e2h#ZrO`}
+z#=qd*@c(!G2R at 1a#DBrxDL`VtP<sf#y=4OljxZxB+#eJu3SAXBR0GGy4i3REfKSL!
+z3R?F7M_z0~5F?9XuXU+M;jBw3&YZrabElm4-kcuYmmVO90RUj^1-9Ky2;qqUpAyif
+ze#D`bm4Lam+FEI?Iur26fN_5(Dg&Mv at aKWvS6C}3ZXMb8xzj>@cUx+EXe5Co+AL>x
+z*1$AdNfJpWDJ=8_A%aE^!KGukGwum9_PY(FB+W<~^q+zMv at WwQ2dn||OON93i5LGw
+zvK at kx=6Ek at L0aOU$vOB4IhVAC&$gr;X-_)9Cn23k4#|Z{7PKcBP at lzP{8hD~ekX%5
+zZ3ky;|K0(6U`2T~dkie;Jndgu%i^lT!exPPaw%?OT|#kNiaz#07z<~^g|%|5Y4-PW
+zoc(t_e8V5b85Exbk)9<$u-x|EPD|T+m*nKZsC8Q!B3)OKHw)xf!(`Y>x;aFPz8w;p
+zq^H$#3&|(FNN?*(Ym0Tq`=l at FM-UfB`jY`<AQ?mklOfz5G7R`&1Q|(2k<nxf{2m8$
+zV|Wlq4RVLgC^pey&JBdw47i4nhaW7S;ag<SEOuF5WnVf$7F#GWQ3ExG2bp2US^}Q6
+z%P7{3z+;=OwJrLs?Z>fyE&7d}wXUq at zHF1g<e6Rd(nCF_ng_`QQa~mGz>~;i{4$wB
+zrjlu7I+;Ocl374$29Z5p&`JGuF2E8RJT at 8=VHVjl3g!?@{^~$YZ5&Te_4CM_b(OWz
+zy3Sf>T|1G5gP4fFi_9TDGM5yQV&Vt33yIzmyBF&k>*^N$TG{Y&9yNXDsJf!^V&Bjj
+zABb9qyUR#9)MByf&7{l at 5Rv($f>e?*q>2H_q$`t%HYLi+YyH;xk)1krX8&?~^x&LE
+zs>%64D7)-tQqASROM*axT4<?`EP%Eak;UW!#-cDN6 at gL)J0k{bI~2pSudNN%dh2>q
+zv~HMOus8 at oCr}S%wv?`?2?Vg};ag^{AJ8cT0VNkVo`;OS+sGwkIaxtgHl3#Iv8{es
+z+e6Cz6~*ihpzK7R*bg8K`+CnARI<8$Sl5tC$z{NUSCA{oTKqw1^1*y#vnwtk2L_Ah
+zteb#iZnJK+Znkcj#yat`#-hh;J-N;qqqd<j;u9h<ya6!G;Tlu(W=2h$R-3FFV0srh
+zf!KN)Ib*V%+_n{P-%Pe}`LVEaN^K*z1N64^f*}AEy_sx-INurO-Cg#)+d+1cd+d34
+zpJLr^Pm8S)(_)Z=3QUTr&)S!bC&dHgLGn;|Qq;5dwlHf?85pRn1O{zN_Fd%3NV3Nw
+z^qC-k!G`=L at -lhFhWs_f+F?U}X9VOe>meT>8}j|+b at E0C@^|VXzbgd!cIK$p)E3p%
+zHXgA<WHJ809<jTvTV^;cZFBsgXx1V}L1uhFKCH*`Q?RXmu^Ag|nuWmztEUO>I~D7m
+zXx{pYeC_a7YX>dUYz)?Sz)0WQVBKroS7;`M7^$Hb8^%b6{MlMRx>Luz at V{<Nc=LB?
+z@(;Vo2doFDm4<Dd$Tt4A)(`5`v1 at 4Jp5{3w^TMXvHXiZVQ4x{1K@>6x2{UZEZROgs
+znV}n6$>2p^;+Q4;ob{OHJ_y$9PrNH^HgJ1*mDhNkH+Yk0(N;DO73&FWm-RSPy}PZ)
+z9p!9WIea{yz$bF;_+*N%r)VH60n0j<0ezM%$?4kOo12r%G+h^_^K!Z`U3!#nMkerS
+zq<~N7Gx$t0(H0bw`7GYcXY<YZ7WgPEF6`u6@#pdq--fK^+wrh83f9{=e@%IyxV*?V
+z{TBGx3e14I+S))>$Zn2j1|C?Yup;9RD+pU;g;yJV6`=5K1z%sTVPzoPI+(n^#h~LN
+zn$9&-<9Kw6iyPK!Jghmu|EH`cfpX7UH=8e+xX{c5Q=w>nhuV<yIK0XS(fkGeuonsX
+znm>>4#OJ^m*&W)86VF&rgFRBPu)MaY%$6>E7rtwu30OE?+a(=4cr)LHgGEhPnB=?h
+z-9bD#CD_1hg*!cXSb;pF(BgaXy`dwg$~O2FVwhP)4CulT(2?BHA1Bz{vB#PYeo_&H
+zK?<2GRS4>=GP2xIewbbE1M9_DTr`Rw&5z;7^5gh1iuIE9vbC2n$5Cr<B>NNq`%D7%
+znL?4Tfqh2V?9;6auumtOeR6WU!*$-$r5~E{d^3J}6br59XYez*#|UGhS^R9i5a{jY
+z=a4bHkDtpI at x{EKFX4yrWx(3=fT1evD8gYrfDhaJ;e at ek{KbQdOPMjmTwu0{Q)o78
+z_`xhwa2fhnl$TZkHJBegreG4Rx3iMqL|3v}z>+p=1?`0)yKz{&2rL{I2$r+OWpkwM
+zNG$Jvs$ZOValg|{@4afhX1xLw+^1Okt(!gQDn+r5M9C&T$k#^cJ=0_+AOx*>2wIN|
+zUta*%M>vQv@)trt7nbh$rBLb#Sh#~_C;lRS8Th52@$<Od{Ajj-$FJa?=2w9sV#5j?
+zGSOF4>aVrla9r&D5LtPdt+j<?8n1`kcYY1GgTKsr3*7fNXEMaSuw+*alLiEDVRfK-
+zQZ=JUXhA9r+f^1n-Hz=tl^<kx`*XwjYpj-A`7(Yze;vQU+Go9O9k31^W*EeP{|0^|
+ze`5snw*mB9taoi-O&Lhn2;6t3=XTBW+9Da8zow9#sh>OeJNdgJ`nebSx!-!v>Bnf=
+z&%tRE%K~*l(7^vvHxKiV at Q+4x^AvRRjCI)QCZ%aN??Z&GqQc3tXo`#@8=mL)*vfAl
+z8-xZCaXbG!{{o1K7x}&RVse<hnfN%f)OeYH1-Ln)soVLN8-&NCVt;jQS)?%74-0 at y
+zrF>*%fzV*<a)q|;fw>a7I>)~QOP{RV$FQ*Jo at SS8T;zRNgl0uPg at tH0gy!r*3+=p@
+zm;oF9BmS6O;cM&jSc2#?{&W5~{{^VC<BIi#^`&*((PPIW1<?r*MBjoS`ktaY8wAmf
+zjviyeC&%{K&PtE{#Q)6yQm at DU;E&mQ>~Fq(3`O!4z-%iL2&+KArwl|3%S7>e!Mq43
+z*39tRk&i+jJddEcfCXaX{e$&Q47>$Nkohr!3-AU3{H^t!BY<~Xd+U+P>C(ed&OHFZ
+z&i_z33x;3{o-k5EqCgl at LTXH;z6XFpNSSP{szcCTtMXO`idl|82%Qpm;yj2%DpSa^
+zk^0U0DHc*KgqDC*D+j5ctzROLN(9%sTYGQ!&S#BNJE6VMp&q9kA<M?8YfPMe1$aU@
+zwPKOE4nelg#CX>`*H_~$uktc{qA^Wsf~l=ZBhl?C<lE?;w*Ii(??szpLLY9A&`;<u
+z3=jrF7TW+}2#9GXPODgdT7O$79Y#KB{dKS*ULy3tKMTY71Yv|Q68?q=V<;K`EKN~s
+zC=Q?2Ulg^4c?AX<Fm{h_XKSAc<An)AK|Q&q2>CX-X2c}dDZnR0F0T`~^Un7#_WD_7
+zh;4`ky%3J{*RVxHu*pJ%f+BW_U?hp=2tGz4iUf*KES~TSCH!%r%%0#BVTwro6mMYl
+z&LOt==XR)2DO3r8dOU-I&&G3MEIcXV8Bq0%!6J;2Q`cL<G-Q>(mL=kO!Q_JZ9h at G*
+zwzjA`63+{Tr4F8Milo at gK!uBe4VF91pim at Jq(pE*J+}XXv=S~AE)y=V$Mz~=sg3Qm
+zv9WbA&_dWY8(dje!9*3<kbb{+u5FCN9Ip%dXO{Tp`wN{rQDb?7u+hQMLlGoOHSs-!
+zTZCJAUAPU#QV0BC(2aVx!@&-Gikz-FXU(&>3wH>2)?>Fr*l1&SUu^7522=>U_#uI!
+zx}bLmgasjJ>>bU}0`t6t-7PF}?iSj}Mvmdb!XplT;17ZJYKq?z!Y;t?sSth%6eY&M
+zuhZGj$>)UUg+2B7y(Bzh<M&!@{E`?@A^Z{?{Ki&!$M_e9U6pzS1674p5bAfdZX|+l
+z3U4_GW>83`i7BxT2nT^l57jeiGm6rpm^37LI_I7BD1In>Bpj>9 at -yKr8_O?aW0}q%
+z3t{OUTg?n_CVPV3puegZ*1c*AM|r_sv#%zA><QRKz_egCoUfub65Vfw?;La=pa=|`
+z4^2b(QTR#tS@=cxRrpQ#UHF5G6HW?$3V#WI3#WwBA}1mdi$vr_K@>$vltqPaFS<mx
+zsFE>YZaLz60=N=jUO7MPj6Cq!A=t{|k+u(LhyIzG3HlcJnZH<Hm08fNaCwzeI4Rsr
+z$mb2U0_7o24GAKwE0{TrONFb$ijo5bi(|k-4m3SwVmL_dJh4+~!FOdn+t;?0={&Pn
+zidY<&A}>V{{l1r?`zUHf(LEHkq-ZBa_fvFE+_*&$0!Pg$Y5{i6k|nu$5c%$$*TrUl
+z?%?Nj?gX&`aG2OaUPM|ExF_R$RsM>QA0ftB{6q#up_#rUr(?Gs-ST?)+d*BB2@$`R
+z!h%R{CopNcbXt0_enn;vQ;d9qm at K9UL&RqA2aEz*aR*bPpc3z9ALoXA6EVwbd7Cf-
+zwB=E;x!3~#B(@9(Nbu`IAMqSmX*epj63-P|leI9|?ZoyXkB<rvZx=gpV239H{q032
+ze=&q>7|hHqa#p3nzgSi#izVB`V=qoktf{MF)?cxmV;ZDr2t|V_8f4uJG_|$&cDS(q
+z0 at 2t;34_{&fjYoC8UEcJ(gcL1Voxz&$QOHyeZ;;3q{>PZwWBE4`h%i8ih5Gi2c}63
+zgF_rB4iW~4L&TxX;DC<WQ^-zZmIg&R7ML2g<<J?%FVD7!J9h_(+&O3I(k2l|ag;b(
+z93%F$1HUuH0w;(9JJX=0jsT4v?p;UGd4*=l6fk_fj#?~k-(XcWHW?~?i^0- at AP>ts
+z^Fr*TjM)!f at HE2t+d<GqzFIE`Yq;=xNBe7i%<L>LDficOY!uQHr-nm%6m_!hn+Ya2
+z3!2$ZqwP|OGex!zQ6KZ(Ce93pPhwGSj_3o*71dL&GeupZDF;C at M!B3kJE~!mu1jt#
+z(v^$z#Q9==EYfvlqsSuV4(TQh3se+`#ay5UTwXgK>|Iz^4hao*kO!tUTk5x?QjWg%
+zdn?O}i{Uv`s9`I&j at l0C@L)$*Ec9x{IzVq>J$l_J>K+?Ch}1yL&qgn&ODy!3iWiB?
+z#NM&c>jC^3fnFbH(H2I%8j=-lbGxX_S5 at kVfev^BkYlm1rrfqc0NJ`4$VRktub9BE
+z^i_9^g~w`f4d8KEy?)B4s8^JJVxdbWQo5YAf)dw>SBuw#6_mI^?86k4cw=k@)f?tt
+zSV3ht28K6iFX1q-=LUQ=#a;-gKz3#<@NX420r;EihoLV;{i26~IYPi?9c(M<AI#4?
+z#k<7qV&7P!&>!SO#3)RUo}X-HIa>3~iq)Q&Z2krpSI!Mo1YrbWk;+%>4U~W}1%6=A
+z4t;iXtU8d^Ap^ZLbGCu<p+(VT at xd+Om18z8onc%YPrNHD*aK!ySnfRv8N48p9~Ykx
+zcZpBhvJ(V&5k+e#+IWDA6QAa;7M~HHC3WI%VTAZRQ1Jz^02E$GK!Y at 9k{LAT at M7kM
+zGm$~jaL at r14YN*CG!$eN>kJ}q;>#94K4;Q!#+8n!cum{~8a+bRZx;7+`O&wU0`V3<
+zMtnys2zN8r+Dp;Mh;H74ZgRs29tOcK9ubf7!^988j|3uQiJwq3nxgU6ixf?wXd3w4
+zu=Qb96SGtNTs#gveQCSR6pf*1Y_#Ld_&x8eJtXm4 at jLPRdUpR=JYuu^@3Gl^9KaZ6
+z_hbl}hIt*_z?xdGzoY~#l%^2>CH at T%pB9Hg^n#)Z6cyMIGbIE8j1Y_G+VKmU#dE=c
+zXrh87UJ at ixJQ|C|Co;M<$k9@!Nap(e)j`lJkQ)`&Ai-L&71 at jo%}^Wa_FiAmTkJ0>
+zuksf&*Pl%Yh}DBpIoL)AY)xlAS2v_cd#jlx)3FJrk|9BaMv4nzI+>y=jWErDs77w5
+zu1uzOWlJiZVquyrrAVpbhc>2bqm}JcU=ABoup-Wb1w&X!4)$ycM{}tKz;R9pj_DN5
+zh=e1ox}5Mz=N`<DjwRcrwo*H(z4%cqlFwu;+CcIy6U)kjVL?(09%C at X4WPWh9AE<i
+z&ntXj6O{p-eWj4HAA^2fr96PUdkF5?6cxsT+gXP?vow@?OMRri;wQ1-o&$3#0`B6$
+zc07)m8g|mNw+6P?0oSmdc^$os!`Xw7BJSXLARYSKq7v+j`S3UZwhmY^wi{C62NT~8
+z9(g0eWM`I(lVO_>NS!9KL>eiLl14YklGPOXDJpIdCenB&Od^7w60E*Ru=*mw>dUHz
+zpl3-)-bm9y-bgc~nbIt2wp1w1k$lozib^R0Yd=5{n5PRVT0+q>iY{r&PJXEb0D`ED
+zGzung8Aas)5VN&+!?z>#nFP-btq=b55TsNoRY~=687U~uU{XgqLtJJaK<Y at H+0Jmm
+zl&oT at YE2<sB3%fOUL+2+A+4aO(t#9YO&C<$YU|#;-mHl&Z7z|PODm+Au~?`Is20IO
+ziz8X6Ia_0E?ie><%T(HI;d9~+C19b200-$*yAV7&o4dvqO!bcQfkt)A1?JC&xpCmA
+z;o}C3?LT3V-OjiP!$<d at FbzyQkW4kf81v^!X)U0?E;LZp6rCS6P)yW<ht?xx44uU|
+zT_<gjt`BPm=_YBGJx-fqYX?xVfv|RHJ*m2w8K?~y*n%Je&yelcbPTsj+W?6>LP*q7
+zR2K`0ZlS=@Ss<}P+9};rkHiDgY#WJ3Vk5BtW<wZ>t|27Cgm3Mb+8u0Dyp1E;&IY3=
+zq+Ng!M2c*#Ttw00SQv$E)U&|oIq7++K2#*VBo*2iogq|o0Zi^NM%}^~HSk+`Wu?Ek
+z9LB0*v4asri at dcgZ3iTFFy#0)9i=y<Hvy-&LpWVX(b6cKn2rHf%jtU7%M#Li(jn>n
+z`eFJ&nqwpNaqMBb2*gzwsW7ia428{X4ZL?oUi(}+4p at 8{k{1?5)WIS`UUUJ`mXm9%
+z?0;aLd at Fq?eJ}Z9$%~6YtVYO-!qC1*nB)yAv%JI$PJ(x#4}2a_Da>M71YA~ai-h*x
+z`EUu at u<e<X=c`)m4S;~K<L%5VbP9PPb%<@bjv*EPkWK=Ue}#}-PSJ{JBtb0LNZK)+
+z&fQqJC6)yyBN at v?ni~tpm7q5waGW)$&Q^^Tu#*5bR<gy;ux-Umf$Ew-Eo_;tXdgub
+z77?fd?dz*p=z|cS9cBlEEEuTtM}-B>tWT#ma6l8CDjU2mdm41=4Hj%nzO+H5%83#7
+zxtwCPyq%ZiX2M1}U3f&!v>v1AatJ9?bQJ_%DY~}Fgpjl4=Fme+uw7WV`wEJ#w8O#7
+z%6;6{k-5y_>DItVF(WN<8 at a9APHq;9$ZG+H2qLeD_T=j00}vziRROs}sVj~#<5<E)
+zKF1b at u!<e;c7h6w<Er6c02mEt&jkFoLocDKFbKY4$O~oBS9lZ(KCn<kd2Lg6le@@W
+zfe_t7gn-b-)v*WxELI;_fV|lz_P*Rp?k)F`(_<0h8W at HMLJVR&6 at t|c>U%>$eZayF
+zB?JRC9lfw41m;^ASo;n~6+4?c9H%9QGL?tQ!vK#FAw1SobX_DKFlpF;cC$ULGYbZJ
+ztUOL0FK5O=V*~I}1R9q#8qXTPJ#(0s?Splvg|-#lbTk3^ju16tBU1 at M6!y)~25ZCb
+zY!vXej_}uqfN2Xt0xGokPW0DQ0-IDgzx=gD9owAIg`YCTIj!Q|u=DM>-tsK|c*C5!
+z%Q_yKP>>TM&jlx*KPLEOzg!}hTAx#dD7uNFO%!cyI(_EJ^ZDa)B~be~OdoJ>Zn0PX
+z*z`GWLv>csHn~O)%C)jT7P)VQ-XqApeU$BuFgAAh2RuaxvooV*DqEfpKrm`CFgrWN
+zqeCd3XdC_=y~9gv5<8CJxk2ynacqLrKtXRv(=f^A2O$nolOPy-MNEd3SHW^=c`*y;
+z6_tUwUJP;&b{2)ATv35fd#Ta!mH at sOb8M-65m3ttQR_B}Hb+t`<WhHUkTo$wlky6A
+zrMyZmiAAg}FisJ~x&ctGkLki<M$F^}ZzY_L0pdFt0F=YU89(}~f^`t&4LQ<5KScL{
+zwjI4T!xx8+325JRv9$(H4S?Z at B8?9ka<l|2=J|_b(B>+69nj{Q5N)<mbbBOiz%XG8
+z3LSDnMldr{VmZI^_3{n!M!7T=aqa*Pjvx*=zih0XFd9fvaDQWYzg5hp3cJ8(R${Pq
+z*`bdejFPv?+Zy6pTjkrG2wKCf>7ctqt1k950o<Go2|XB^IXT at xm4_EmAXfcPmRqJR
+zf;D^=>43~GNK%w{%J<l5md@;-=&ywIuv-6Sc_)`Y!!A~6he9IO+2jYLInFxUL(D{j
+zte<q|^c2<`DuuNHs1$a0B5OV-_Hk-H!lJ6~8FoD<`Wsp7X=#R240LiS>%g!J#%^<u
+zG|MUc1anU6p=l`0z^R8VvYS_=*-lM}KL%ONW{tYB5veJM^CuQZ)_X%Lbm~3L>~5%+
+z;?#3W7Dkxck+lv;q0ES9nYHMiZr5Q}cur)gBhp-_?dO=i6;UcTved_ at w^M2l94Y_+
+zB-Pq`%?lf{bQ&js%3p{_oGK7~91WxgGocWsD+{7Uw)`#X?i70o4lZ!dX3XMaM-N1|
+zC;ue>%x%CB&3=`lSKtg4$fq;rvaO1YWFXtBYGJQFW3NBtllJ<Wb1I6nVq at n@1!}gy
+z!#~e_WD4|g3i^O02IylS^icwQ3fj!xx*A&S?pY7I{FB0SUew(#{kny%POz;rPy?C}
+z(jKd7A#c(S4BE#i*sGLLRbAW$<aG2Vbd(!ne3mp6Rm_AQ9Gu^V9tKP*gN^i21(Kiu
+ztWpBN??QnQ(;;lc^lxo+sdOmS&n|TkN)3kLV-49Um;ECa$D&$p4t4t5bq+zDp-`u;
+ziq(P at m#8|Bjt-gQ*8(|O!}&N2lEc>YNi1d&)m#UltV64#fN&Ay7sHO?SVZj%1$)}<
+zd<X^0XI=n1e`A&F!EI1rZ3g=L%5qb5tcm(p`Y3%#JEcEw!Y4%#3;)#Kho!I()5l<R
+z*gNs|uvK4W2-i*-rVOu-a^ZFqr^8l4=5aES*Taqs<aC1T&akHN57N|?QOam#j51ak
+zr;Jx7C<Th02Bl2FhePRoc8>2#Nbil4yR)^<FDUwwBCupW10)>xbK0OfXT>sdSCTSA
+znW at aOz)n5hqF-o>i)l`SeXR at pEGaOw^q}|}l75w9xQ599$}U)Fr}-Bahg*&soHC##
+zM8trWKQdaLXiCdUr3$E69irto6nz^(%Lqa_zWG at Zs!my;EL0XLi<Jw2P!}rmm~XCF
+zXC&136#ZZm>N|kYA=Kmvpv at P+?kjuMMOhw!`YIdsxJc9??$BsnTn4l7D;w{hf!7LP
+zx<{06G8xwam4N&}rN0=Jer-yn>y!;Zr5i$2`i-LBV^S#>vMIq)IV&pNqTH%%Qf^Z=
+zD_ej{+mvf;D&57X<YbG()`P|@b&{e#ZA$$CP&$;F+P}Ei%W at 3DwAvX#tNUzP84<XH
+zYY at dC4{;j=2*v>Frx at zeY)4T$mT7U5qRza8qShag@)BARA+I3ZO5<wck%niZ8`a~F
+zg`ZiUH+m%a!jHfkX!ML97Jg>E82RWu5HfeOM_2?Pm)Iss8SD^`0tvW-`_Zn?xTASw
+z{ZF8NFT1`1k1A#|J1mxvf-U8^w_VN+<pRK9%swxNY_V9SA(==Zc4<g{v%UfIz_E`b
+zwQMYs{{n36^kP80KCt<qiFS at c490<%Y{b|QJr;==8|aPUM-ZH7{0z*f at bJYqdM3?i
+zcvjl@*{p_VfyU2ZO(xuCLpC7j6M#jU)9`Fb<9dY+&lWa%CS--5SwBTQa<vBZ-eQk%
+zGsefMjriDJ+HiGnb)>laz2*j3V;qf|i^qi$X`9$vTC4O`@=<r;VmMi&7xy6SlKMgH
+z3j at 3xGJHNn*{GFV3Qod&(hmPA&E!7fuM>ReE1 at OI5_j<$xl16Zr?6D$k9t9d!3c=x
+zTqETP2T@<#Lz;#9!$#c>!dud8)I;>~Wzs0|BYq4zBp$&;+~f+1k3+ckr0mBD@;bS>
+zuuI62FXFaIbHz`@CvkUJ^PMLZ!j9~Gu_qdc`wBAm5ceaB$B^D54->wFrIs1|=jcoR
+zm{J7?SoN0PluLvG5D<ES<V!x3PkM{3P#@tD)DQN-Y!K_v0K8G|s%((c#X*uO9hWne
+zc_@<%gM^_cqzlD-+>_)=bA($_3BO)y;d&0Yz;`pQDS$m85bGWbDYkZmJ<nb&0Ihq>
+z>cmn}Yv34?c-R`1&C&<l76dU{v9-rp7UcVEWq$rGATD9gI;@3cSqES?TLqB94a?DM
+zV0+o^uzC&2EfOR)1Fys6Yt5o<zruPROCTIzl`vy`sI|r3Wu40G>s*##vk&5uY+Z4$
+zHIA8~Qz0FKVn|vVVMokYF#mlzxN{I%W6733F|XGILl~CyAT7WuVynRWnbEz%n$MDw
+zMp!{el~1>t!<iPa$kh`fIFR~huU?hH-hl}$B=IdA4F+OvDRXyEviRB#3mRW$<yqk5
+z4YB&OG|R!Tr{@sMkQr_*hG>?pDXxN4Dp=mN1IE`f9oG&vO8;T!C{(hno^seCZm*~r
+zRuAiKSb(KC56%`@0 at KuHTyD7QCD=2g<SX;=pG;GM%sj!!`D^&`>kvMHt?wO3E+P1H
+zwlzH)+Jt at nYr-WCS}kwGyDiuN3=Tg#HNeg_tv^7(NxN_zb{%2+tRYU!QX;mx4m%#?
+zd)yJ&E4bA4K{y%C^`Yw{{HN<<`1{oL8U7PoOxQ_R1n~)qTTtBGy0k^#?+(lhd^C55
+zy>p-9me!@V%W3a|cRFYL1li#QOJ^1q2Ow+F-ihxR`>wBCUjrcFo7-Gpg%hw2aYxt*
+z0MWqU!>(@ul<(p1M+S}!L at Nfw=W_8=-#yVi5(o$X+#Dz1VV|JTwLY7~^*f`}F>3{+
+zW7>3blHKf55P7swuyYKZ`z(JVm&Imn7sd6r>y(p#38**({M#WQINn{s at y>;XsDGME
+z>PBwtCT^azbBk`tEsL_-#kY6E54Yxqb1OSg3}UPc#V~0;rnoc3ohXJWaX-a5^$C~w
+zJd=5oVCJ$Nm|Y+v66}(C7yyq17RTz};3GiFoO381WVyKG|K)s3n=t>gaKcpELj;SK
+zu`Hb9>Q1)=in~E7O$3-Wosrv}wV9m~XfwB~gS&Z1tV4<niWiRvK54cvK$@lGlXj?;
+zuoT2t3vL^)a~}x<I4}NF_zpyHJj#S{<dd at B6(sGXQQSlPJpMR3BxIp at 5aJT)1!Y=6
+zE at VDx1-X>GxQnzCKM~$St#Auz6nyT6b_TF3F`u6&J^@K9kE1N8;|0~>6-L0q`CR at u
+zCUPk(3_QY*kxMwQGz#{xjKD2mf8=Os6r2pwLKwi>gZ(_)U>}v2{gyMK+zcpr3>|{#
+z<~)G26|8O at 7hCZ<>5X?geG4NH{D!|V(06Y*lCZg)4i=;i*`FUuJ}B7^#glx1euOkr
+z7y$VHDUA{~A_gh+gR=2PUbpjytkxhrDGRm+nMec42eRd3CbuP!KyzTX*5e?uPlBTe
+z;wB4(ZEFx-Aka6m=qwYrAA=YMvAN$mZjFPjGSFOWPy}0`WJjp>2WtsrX)8M$3(A7<
+zO@$|*{r&KDv2`iy6)u?=+z%3wB|?pWGZ^<;lb9~Sb`}<-8(aeIgNWa1udKwgQk&RA
+zKf7uTaPGBUX1^|l%ag2q&?zPWj at fS(Ift^Ptib00<#8rGTeCiwu<Id!;vGz9*$}bj
+zI>Mcf&?Eqq2Nw(Mg`8iRR%&PGTP<UkA43yYvc>`B`OxVcMj=1jNsz}XPJ_N at S&Oa5
+z!#w(=&7;?!jp>2mAfmA8LE3R2$))&D{<t&~qTXjTJs`7f4dZ}+*Yx1F30cA}`Jx8X
+z10RE>;(1}ygL?>!k4V#FhE#I4rU%~0Ob>p8V|qxYI7rTv7;iT*J%Be$gj*pYY5l)x
+ze8AC7k;ccz7O3#8z!oshpyqG+C&mX1CD<SKNdIpcAHarSdnAJS(a88%!Hkdn4aP at 0
+zm>-Re4`A8yf7SQ^tAiOIha!v*usp#20Lz1(+4ul<?E$-PSoYW3jm!^M2X%_Wyy{eS
+znmS#bq0Urisk7BWb&l#&=c+|&vFcY#)KaxfEm!ApH>wqCrCOy1)N1v7wMGr9wQ8NZ
+zKwYRVQWvWis7urf)url1>N3?*sd}+`iMm`}p{`U{sjJmB>ZR&s>gDPc>XqtR^(u9p
+zdbN6udab%%y-wYrUa#JuZd7knZ&GhoZ&7bmH>tO&o7FAqR&|?tyLyLur+SyVUA<e~
+zq3%@gQSVjnQ}0(FP#;tuQXf_yL8<Cv>f`DY>Mr$3^(pmf^%?b9b+`JQ`n<YFeL;Ou
+z-K)N&zO25YzN)^a?o;=xud8pUZ>n#pZ>#U9 at 2UsXgX(+gA at zOruzEy2s(zq;sD7j#
+zQ$JQeQ9o5bQ$JUat6!*Js$Z#Jt0&ZN)Nj at ADEN}#CgMI60-PA^)BY3>pm-p~gD4(M
+z at eqoKQap^};S`UccqGN6C>~Am7@!LtOYu00$5T9k;sS~%Qap*`$rQs_Or>}l#nUMU
+zOK~Q}vnZZTaUsQXDE3i2m*OIdiz)U~Ttaav#bp$OjX96v`4m at BTuE^i#Q}<|DL$X#
+z8j6DygXLC7 at dAn$QoM-b#S~va at e+zJq<AUC7g4;7VvAx*@x>H_fw`RG6%?<ecooH~
+zDPBV{oJn;V#g|ij1;tlVyq4mtC|*bL)f8Vt at wF7Mr}#RGH&A>%#Wz at ODBei%jTGNR
+z at y!(9Lh-E>Z=(1%iZ at fdh2pIgZ=?8jitnKKPKxiMcss>+Q at n%XofO|g at x2t^M={tv
+z4^aFd#Sc;ZFvX8h{3ykbQT#Z?Pf)yz;wLG7isGj!eum;_Dc()-a}+;M at g9m_p!h|K
+z_fq^4#V=F*3dOHd{2ImkDBe%;>lD91 at tcL_Vzw2)YoC8(pHJg$&8(;YLe?m(v1Y?&
+zZ11FMud}l|)ICI^>o?#-8Iu`rb`;3l8sdi4aO<3?@+>(qw4xT7ehcNgM3u9%?whWy
+zHQLAs)dogY3nvPNa?Z{!^$A)T#SS4TFM`EoAaCpcS;{{&mlq4DhQywQEW31E{c2Kp
+z`4uWAM^&s3(y}Mx>Vjoq+P98;k{Chr`XiO0M(e1y&b(K$&5ZgJ&^y3Z*zAbrVxAq@
+zW?FsuLbI)Xnz?sCV3D^qcx(UQ6q3kpx)+*dQ526(B4C*S|6A$(K!}!*6c1ZXm>=YA
+z&Gxdj59h|V_lC~^YBMvmea$WgzG)PAp_FB4D=vaM&hlcL>Gmx)5!=j;Y=jZh8JpG-
+zenYSgyFVbR`G0367GTL9U at rziX0qd+hA?cvw#{UQbBEkQb5&G-gCo+1|Esy50Q8eh
+zB-sBy84Un_<YcQqcmwX|M$Ch=mR%_k%oKT6F|^l68lKgDf2bDOViePX00F*mID`f1
+zy{$v3F;J;}l%V)0v$)VqYchiN4R)LdG?pGgh{i`RM2dheg=VXWqW?fV6`CER0Cc#Q
+zC8@;T%^%qd9B7n35!6;a?yc<|Gwr=j4tx6uDcnB12N{GyD3<}yX&2S?Kin$?rIVtB
+zba+9eO=!#Lf+mEEoQO=3|0nYJ0jy~HIr{;eB%fG2lA%IE1Y-_^6<L;R)aW+s|Fu`G
+z;dYmZaXi}u>PD at B7`D$$hucYx`~r~+=i7l&akdk}1J7jGt^>=E_Q~^hhz?jcqU*E3
+ztA9lCf7euK7D1bF4ZCaLh;e|iw8;?vM|MX-Pmwb{$_R60K1{F1I;J6S_iVSig!BjK
+zt9VDpH4-T;BFT9M!)}IClbz5BP**ge&wo(!&t#pBs|l3Ci>M%(gE3a50CYqE05v#j
+zj)(c8!90sdemQflIkXdKg4};Jp%{96EK05af2BwxJq32sJzz7W3H|;}!)Qa3hN8I)
+zGN<gb2E6~>q~kVI;gDtfbuo?Xg|pS}&7&AK*7+Gg#k-pz|Nm?jBtSbqii7{t^Q9)L
+zxBrs%O=%=|BCHEfgf6jPfB+P!i-PgL=iYl9z3Uvm9P)w&MhbXmYgB~WdbV=W!LoJ3
+z`FoKT8aO8`ldZw|j-INO;q$E;n|uGmlNf-|kw#AVl__vLGh$4dzNr8TL>d553XwT>
+znbA|U(TQAb0%j678eVr-#no|MZaBP&$`5a%^1 at 3PW4xJ)gU;GSK=TjZ=)lTGjMhK1
+zRM$6=647+GbIRG)iT`FEf1BydpbFZ#j6mlIbV4>i%P)n5Ou#igiq1_Qw~Bgvrqu69
+zKI{x}f`|^!SOxeds%<Af3?PbBXd!DSl9igiISJ~-j1xu7u!Ss8)DSmvGIN4Z at s6k|
+z^Z%}ZcZ^Y>?KM#VH{!MbOX?W1X`9Rf`-bhxvam^fv at gP9M?n0_C|v%-8{?qANI?~T
+z4;b8L4n2gm!j4jXBnyO4_~f4kzt{2kZRa<V>+=dtZv at w$!K6rz5JI*)Xp8b-n^{p2
+z;gF>t3j2<0LfZdfR5c<>*)5tT;gd;$CX<`=$`t5AdlwLFE at B6&{TsWipy8ybNnh{T
+z7n&2InBjk^x6~$RG(;d5HF*|2oBo3ub6pg!(cS*vQ5c2h`Ax|2Uzm_lVV-&oU_?w4
+zCt&gq<qKE~k>QJw4r^@Z)E`m_OxUcECE1`U;NfLW2oY)D{<p)tMNzEsp9+FR>Rk5z
+zE+9kvFxUcj0c?+miW9{MQ8f_Haq63@*_lJ&1S{AmH+CVs90)dp*u&d8LIP(;2?a-Z
+zI)+#1yhea0mQ(w0L}EY!MQ~Tc(b8>ZM3|tn90)_}6464ENv4o!&T1m at qk#@3ifFKy
+z+I>^_2P~*I{D4JO$X@*b@>6R#%3VtC;<l0Ako~EVT$ITzlIFspvKMmYVjsv7t%OX~
+z6~aO85|kwmlV-!=NT0Z#69;isaA?m4ZWZb$9Tzr2>QFv6g<A&cQ5!I17uxxwGPi~=
+z6MJ$ax#_3}Ch&ge1>AB-kh%)8>w at rp=cQ;Mc>#`(>Hy~}&*LV@>D)NTp8ZO0#vj8y
+zlqz_m^ku>>ZY&3z4*AiL7yFj9i~9j}C;4D@&w}jMi7W|=yIfo&`yqv?KO|iBfh4Ft
+zkUG^%JkHI71gYK9Hq;!lZF at m7*Dl;!@^LG<xsb1VAvarED`$#NawXy>DUU1WM)Skq
+z?bJm|U%>}CwRMn4btUq0g*@czi}~_8c&GJDd<<`dU1omK$Neak;JXRDRTbW5Jz4Gw
+zrzy3<J*64Kty}>&A6||yi}Rtraw!@BFRC5SU4i?ep5ou)QQ<r8K{AZ9xT%n(+Z=b7
+z3dP5{^SO)R&Do>m`P>CUe{KdhN4Z8Q5iW-8-u2uV;Sr%FynVYGWlJr<<ygplB%MSh
+z+%zu8_J+Slu|RP=B)*!Ecr?L+CF*l5$Si_9kxL*g6y98oUSONr((N~1&u8zeMrrWw
+zYL+kyNvT0QaTM14^X#;aH(2)TA$Xm&HP}w@&{)z^o^^s^0y#-;mSA!sl(YIByzZLi
+z&9<{#6mjq}*{SRm*ytnnQfx?F!l{tL1UX$e1zw#E39&mM0}B#KApvE-1pr-TJqp=j
+zRsl<V{hVdxeoNsU-E3=6qDA3N+mN9JIam at TctHj(yl=P at OO8EazvX+gbqq43Fnh^1
+zOR%{K@~ehIvRHpeuBw4ND at gl=)Z)F6O2yK!>R7_n$B<DB**I%hE-oY<=#;%39P(Hy
+z?N^4wNhOfYveAA`ct1N)c$al9I}Ga=`xWAln2cCfaChq)ij!F;Std*T`5ltX?2O>o
+z;O*m(_q*86xqXTy6E|mxHcKFF4bpp0Tc6pvGf-^^q~@}`F~j=Meg}CgJ45baYXD0s
+z8V;`_w;+um2{MPfLXI@#)3Fq}cneY*czDzKbhfJ>@{AYSImrho2GTrlL52+^L;r34
+zZNCKlK|9fzKn^v_7<=1V#!`rXu|9!UoLi782Z{F|z>CdU64MGu4F&|>4+#c6;K%~K
+zT0dW}(Sv%eUZ*e67wU`j#rg&M68%DbseX~ZOos!M^^5gO^yT^reWkuiU#+jvFV!#8
+zFW0ZouhiG-SLy5YtMzO2YxVW|b@~SVdi at 4{qkf})lYX;)i+-!VNxx0stZ&h`>f7|&
+z^*i)C^}F=#`rY~teW!kpey at I?e!u>J{-FMl{;>Xt{;2+#{<!{xzDs{ne at cH^e at 1^+
+z->pBVKd<l6U(jFF_v$a{FYB-9uj;Sq`}F<#>-rn|oBCV&+xk2DyZQnBp#GkINPk~H
+ztRK;j>L2JI>L2OH^pEvV^iTEA^w0I<`WO0_`d9kb`U(9T{agJz{d at ff{YU*L{b&6b
+z{a5`r{dfHj{iOb<{+Ir at eo8-Wa0W84K@8py4AGDb*-#9Z;Wku5Gjzi+Ov7Wu8SzGf
+zk!U0t$wrEiYBV#_jC3Qz$TYGHuaRvuH(D4ijdP4v#<@moqm9wlXlJxHIv5>|^NdbL
+zj*)A0Ho6#HjXa~9(cS1_^fdB~UPf=DkI~oYXY at A)7z2$##$aQJG1M4l3^zs?BaKnU
+zXo`U;4pI#A0Os%e6d$Je2*pP!{(#~SDTaA at jN*?e{)FOBDgKP&&nZ4m at fQ?-N%2<{
+ze@!t=bKvoBDTcZIJ;gsz{3FFbQT#K-zfk-u#lKPfJH;SXPEwW^{TIc5Q+$fz)0A+O
+zAWASLgc6<-ffA7ti4vI-g%TGfZc0>2G)i<z3`$H&Je0&y5>H72C5e<IQIbqa3MHwO
+zG@~Sql5|QkD9NNGixMv-*_1S=qy;4{DLIFdR+OAeNoz{lP|}u?c9gWIqyr@#DLIdl
+zPL$+Ol1oWvO1e<em6AM4x>3 at dk{*=wq$Hn`UX=8vqz@&1Dd|T^e at X^WGLVu%lnkb1
+z2qi-)8Ai!)N=8sJl9ExBjHYA^C1WWWN6C0fCQwp9$wW#fQ8Jm5DU?j5WEv&YDVagZ
+zOiE@^GMkb at O6E}Fqhu~6MU)g%;-{p9l2S^_C at H689wqZBsi35ik}669lvGo4J|#7j
+z1SzSdq>hpWlq{rV5haT$xqy--lw3&3Qc5nOWEmwEC6tnjDY=A_<&><TWF;l5C|OO(
+z8cHsu<T6Swr{oGsuB2owC09|hj*_b>xrUN!DOpd+b(CzN<a$bOpkyN at H&SvFB{x%Y
+z3njNwvWb%0DA`QO7D~2KvW=44DY=7^J1Mz~lI at h-P00>Qc2aT=CHGQtA0_uw@&F|d
+z#&P`mp&oRv2i?vt at Au$79(0EXCwq{|Zou1QiC$`U_n<E9=iMGu?Ln7$5WHTn#)EYa
+zx}V)%<-sl3_tPGn=0O^}g!jnu>$k9v6&{>rZ*PP5EB+nFq1CDfK_@{ETFM^#&2{YS
+zPWCavgU&ZE@!;kjw9ZU1_n0$1aI`QyxZQ&mv#L+AAEh2-c~FH1?ew7KCN=M3H%mOI
+zlLx1>%a!coSr0nbgEH9VE)TlGT<yVq*^eionN at pPTS*>tp$DyCH%GCLG7oC$K{@Pl
+zhzBh&lUd0Z*w07VhfS*S9 at N2u)_Txf)<UKS&1a8nsJ44>qS at 1f+M4^=y?Lxas)rpu
+z4DSu**FVQT;O(Ypb({ymTUGh>x#o53>oE_`HhXw*iU-X$uVMw_J*dA20qU*U^Q|7V
+z#e*_EIMuYV$?@Q3>^=-qOZI&etCG#GZeSm~*~ez~F~Ng;?E4Y+ at eC^kAN=}z*+)kY
+zy2yjNvCDhl$*Mgbw9tceR><RFFHGjwKWsv`S9{Ph_WXbcRkDX^<}2)3Is1 at 2Xe;~P
+z#y;+2Pc;utU_Y++plu%1#)G{cbh!sz!tRasAnHN0%-7hD)$C)W2gjMOo4>H at TRmvC
+z2|TsLT<<{u5x at RM_VIuzm}^<f2_95y{_Mf32lw`%E7`Lr%$wQQaPw96b(aUt at gT{A
+zlRWqw58BQu0Yxum-=+txVr76`^4M=Su&do3bg>6L=s_O#XdL@^+=JuUcPA6R(CX&q
+zeh)g&gAI0XhY6+Em=D`ZnHz3)v|5HOcQYr#ayPp;KVTcXnP+xmFJc at pcJ4el0F%9e
+zakH7n-n<7#a*u at fAQbnnDJp~4NY%V)_B8Wn4Ij`kV3&jw(tH-;WG<C!&b8yZay_}e
+z(u30DGB0P!IdWe(IA)eyEL-xG@{RIld58R{{DOQ?{zN{lXiA!rsd$wZN-L$c(pKr9
+zbW%Did9a_TkJ3*Ws0>ktD<ffV^Ax2>@hhcDHEi6yP`OmOM!7|~LwQ_zR(V- at OF683
+zrF`eYF1IVmmEuZuHFuro%5(K{4R#H69dNzpdf#=#^?~an*T=9W=yTT>u!ZM@>s#0N
+zup{SZ*Ke+quD{(JY-<tSid%IX?l^a%JH?&m&U9zHTe{D6w{>@LcXD at j=ec{hd%63%
+z2e=2jhq*_($GFG4C%UJ&r at Lpl=eUd9CGK)}g*)J`ao4#QxtF*va#Qzm_bT_L?kn6^
+zxvz0w=f1(c-Ti?3S at +BCSKa&Eue;xLzwbWc{=j|0{fqmQny99$?bKdsAGM!4Kpmt`
+zf(+&|$WyL?9OVU&pS%?EkXJ+Y at mk0{egZOr4?}+M3H3Kk(Bd?&)?7PRYooQ(I%wx<
+zowOV+PwTGr(1vJ}v?<y&ZH88))oB-L>$K~%E!sBi4(%@ON$myg4eed+lrHHWJzh`I
+zo9XF#rta07>*wli^mcl8eW*TBpR7;Sr|U(!U!SK}=v82e-2nF2Ca}G>hU~7LU~Rnt
+zR?<PRkPd@&^fA~(pX+~uWfKn;OLMSEa>4%SXN)%rj7i26W12C~s4%LGYNN(jVk|dS
+z8taT}jP=F_;|AkKV~_Eo at v5=Uc-?r at c-wf_c;7f;d|-TR{9s~}H$_u6U1q$QXm&I^
+znYm^cVB7A%kG;%3W<PU)ImjGh7MXst)GRmWo7HBGS!-To-fC_&Z#VBWx0^f6`^^W<
+zhe1}qXntq at VE$_UZk{y%GEbSOJ)B4INS;ofTu(Po4^O_Qx2LbCzh{VNm}i8iz%$nq
+z^wfD4dKP<@c$Rxsde(Zb_iXgs=-KHx;Cat;)bpX|nCBDEXP(bJ$2})J-^Lkn32{kr
+zDRIr>(&Mt at TEv|b*E6nHoIkEKt|G1~t~#zJt~RbNZb96VxTSHM<L->x9(Qlt{c#V*
+zJskIF+>>!n$2}YOa@?zNC*ppH`zh|1xZmRbh&vU}#p8HAzH at xn_@42-;`_w+iysg_
+zG=6ye$oPrzOXHWtFOOdtzdHWX_{-z3h`%!an)vnckHqhae=7c&_}%f($G;T+O8jf_
+z at 5UdD|1?2MFcK0Hk`hu9nkA$sWG1voI49xUguH}-34;@cCJaxQkT5Y}TEdKkSqUo>
+zRwrDMur^^`!Ziu&6Ru0xkZ at DNEeX#g>`8br;iZIE5?)JqGvV!ocN0ENbSG+wafu0u
+zNr@?m%@WfSvlCk+o|D)%u}9*N#9 at ge5=SLYN}Q57J#l8@(!`4smnW`FT%CAn;@ZS@
+ziPt1vpSUsc`NS6zUrBr|aev|)iEkyolXxicaN^O#PZNJi;*-QAImwlzCM6~%CuJs`
+zo75($XHu`EK1uzO1|$ti8j>_DX++Zer0S%aq}rqfNsE$}CM`>%Nvo39ByCT+H|hSQ
+z2a_I7dNk?Dq^FafO?o-$)ua<iKP3H>^h?rjNq;1rO6HPrvXtB at IXAgma*yQv<lf1B
+zllvw2PacvyEV(?nD!DqjCb>3wLGqI1rOC^ZHzePX{6z9I$-9%EPkteJZ}Mx&`;*^D
+z{yzD~l(dwLl;$ZdQ(C38PHCIcE~R}+PD<yLi7C at kW~9tYDNOODl%$lU%u898a%IY+
+zDUYW-o$_qTb18dLUQBr at WnaqcDQ~76Nck+~$CRH_eogs36{V6?F;z}&liD%0Q)+H%
+zm(;w}{M6p5eN%^}PE4JaIxn>%wJNnbwI-FOUY&Yv>UF8tr*2IBr5S4GYSyY*_h!?Z
+zRW-Y|*{#iXG~3(k?Pf=t{gtMqC8ae_Yo9hGZ9<waZ9&?iv?Xav)0U;tv`f-fq^(L@
+zlXi95jcJ?G?n=8mZD-oOY4 at c)p0+FPskEolj;H;Qb~;^2k55laZ<XFUy={8?^p5E{
+z>0Q$E(tD)mr}s%8o<29dD!n?rCcQ3wVfy0qCFxt!Z%@B7eS7-O^!w5uNPjr}(ex+M
+z_oVMjKbHPg`l$>d!;{e}qjg5xjP at DlW#nX(WCSvnW~|A$DdVn;hch0{cs%3DjHfep
+zXY9$?oAFA<zKqv1KF;_o<BN>bnQ~@QW>#j0%)HF*nSC?+XAaC9oLQB*G;?+4`piw4
+zcV|A4xi|Cm%r`RM%6upDK<0ay$1=alJdycL=C4`tSy@@_v$|ys%o?3FA!}0Bl&oo4
+zGqPr76=oG@)n#3nwIXX()|#xVv({&A&bmA6fviWf_GG=8btvm_*72<GvwqL|+Z*Tg
+zdSTn5H_zMM+tb_2+s8ZDJH=b<E%BCnYrHGH>%7~%k9zlbU-h2wp7fs1#@T$fm at Q|!
+zvej%oJ0-hKcDw8j*?HMLvWH|3%O06MCwp#oadt^|S at x3b<=IzcZ_K_edwcd{*-vGE
+zo_##~%j~bSzsdgY|I~Eee at z`=7gyX`9CdG-MfM^DLPAK$AR$2ZAU8m+_i_UwG89Fe
+zh}=u>bnk&$cimcNt=77=YTeaZ_g-~Tt>g9czMuE`;haC>oacMK`<K;{702qt;<F?y
+zIZMe>vDB;-Rw^rl1+j`*rK~bmIjfR2l2y$b!)jtJW36DVWUXecWo>2cW$j}fX5D5z
+zU_E9%Wj$xTWW8d&VSQqM%kIJM#qPuI$L6se>_Rroj<HMFrR*|xIlGcw#U90OU}Nm>
+z*)!O)*lXGA*&EoK*jv~q*q7N?*$>zs*`GNrIB}fToX(v7oPit`N5o0yWN>mhAr8bD
+z#Tm`1;nZ@*bLMlJILkOII4e1;IqNt-ayD`fagK0~b53!7=bYm_<__knxEb6KcNlj9
+zm*FnqHgQ*S*KvR3Zscy}Zsl(0{>0tI-NW6-{fm2_`-=O9`;PmC*Pb_s$L5K78eRs^
+z$qVobdBwbuygJ?t-Yni6-aOs{-df%s-ag)b-T~gPyuW!jdAE6YdG~pbcu#oG65<lt
+zB(zWHln|fLH9?S2lYl48PS~1oG~r^xgM>#3uM(OQJ|uih_{?v?kK?!Ix8b+rci?}+
+zkLP#hcjbS_XY;vyDPPXl at U?s$-@?!2+xTPob$pyp@~87>@@Mns^5^px@|*a}`9JWt
+z at VD`I at OScm<6q(5;@{yv=Qs1;3*rQ=1#JcG1sw&+0*yc~FbFaPW`R{;6J!aT0=K{`
+zC=gT$mI{^$RteS!)(L(TY!qx3Y!&Pj>=x`592Q&^wiUJ)#tXX$y9v7sdkT9C`w9mM
+zhX`3hkuY6o6Gnt3!Wv<NkQB}qt`Ke({v<pqJT5#bJS{vUydiuc{73j&_*U2~YAO0w
+z)I-!u)JN1$q!gJ%7Ez|iE^>&9MJ1wAQJJV*R3#cE8Z9D3v}n3$mS~P>zG$oHf#{Lw
+zx#+d%t*BY_Ui6>nljw`MrMQ)NkXR_ziqpjDVx!n3j*3AsBrX!i#KXkH#UsR+c%OK`
+z_>lOR_=NbB_;>MH at gL#~;!ENy;wR!SlCF|(B|Rj)Bz+`F615~nk}A<j(j`WTNdicw
+zNoGjqN)}0$NSY+eB|k`3N!Cc#Nq&@ElsuPwk+zh!lD3hylk%kssZy$vs--DXtu#%V
+zE;ULEq at Wa*#-zifWzuqKl at yo$B0VTQB0VWREj=SWCp|B{D7`GbD!nHCEbAs?$vCnE
+znNTK{*=1R>9GOezk@;moS)Qy)wpzAUwo$fCwnMg4wp+GO_KWPG?2zoR?78f{yrcXZ
+zc^CP&@*eUexmvD~>*RX5QErl3<eBoQe71b9e35*ae1&|ae6 at U?e1m+Ge2aXW{H**h
+z`E&V8`D^(*`M-*uie8GoiUEp2itiL`1y`Y0j8s%BY88_db&7gLgQ8JEC at 2M^n66l@
+z_*wD0;;iDl;*#Qu;;rJH;=SUd;<K`)vX!!pa*)!i^ee;4LM5n#lts#7WvQ}ES+1;9
+zHY%4WHz~I$w<~ulcPsx?UQ^ys-csIC-d8?UK2|<WY at Mh{)Fv7dEs2?l_C!ZwZlXKU
+zo9IsrCe|iWiAxfj5?3UyN?eopAn}bVPW6q7rIM*MDvzpARinaHvsBAf8&$um4y%r-
+zPO5%aol{*<T~__6`b%|Fbx-wB^(3inQlF$DNrEI%l03<o6iynGRGTy*X>!t(q=qCc
+z2~V1tG&^Zt(!!*(Ne`2nlRm3^tNW=3s)wjqYOb2E7OACbxmuxCsgu-twLxuCThzH~
+zml{;V>X>?%dbqk=U8Sy8*Qn>K7pNDjo7BtIE7fb%>(oE0e^cL6KUTj`zf!+dH>=;P
+z|5JZXjwO#zo|rs2xjwlec}DWW<kiVrlg}q#NWPr>XY%#rzmsn#-%Y-s{3T^b3O7ZV
+zB1w^_C{t7^>J&}N^pveB+fsf?*`2aCWq-=SltU?pQ*NYu(X`fd(0rrmqUomTuIZ`i
+zqsi0MYQ||MYU(ug8dTG$!8N32rRGn~b<Hi!ea%D7W6e{|3(YId8_he-zo~svHL0no
+zX{m<Pj8sdiEj24OI~7iCNX1i`)ETL>Q|G46PhFV0B=tXS5A8rLN1LX#YHeDtHlWSZ
+zMzn?6q1tiU1}&+buU({Fs$H)ALAzSJPP<LJL%UP^v-XJgg7&KRfv$zFm9DL>gRYaV
+zv#y)2pKgF|kS;+d(533qbOv39&Z4vFvUJ%xr*62eOjn^BsjJr2=xTN2b+dHGbtiRa
+zbr*G)bys!QbT at Rjba!<3bPv*6rVUCPoW at GyrX{2a(<EuKw9K^Pw6e6SwCc2)wA!@s
+zX%o}x(w^ws>pSSb(Ra~z)A!K#*7wyb^d5asAJG@;hw5QHqA%8$>PPCQ>8I;w>F4U_
+z>lf*l>X+&F=&$K->hI|v>YwPJ>0jvo(Z5L-rQ6c&>DlSdba%QhJ(!-CUX?yGeO~(F
+z^rrL`=_}J$r>{-_(a_x>HY6Id4Nil{;5UQ}fT6$;Gn5!g4U-M^2GsDqfiTd9xrX_M
+zb%qUw&4z7;pA5SV`wYJrel`4UxM{d!xNmr5cxrfV_{Z4Mm~J#0twx72$LKV=jXq=0
+zm}dlx`NrYK?~S;TGEOtjG|n;3H!d>nFkUiVGu|}bG2S;mG(I*yHNMCw&1lT{K7-6)
+zGG=7V&X}9AAY*IBgN#QR&of?Uyv=CNc%Shx<BREQbY*H|lACf&xhA*CX9}9ariiJ~
+zG{*F!X`^YIX_sk_X`gAo>7eO1(-G4#(+P8&d9ZninQi8o1!l2XYF3!-=85LX<_0rv
+zCe5^Ynt7&qj(MJWfq9YnlKHjyjk($U!Tib6!V+g`V;N-eTKtx<rO*OeAWM;@*ivdK
+zvy at vZEsHF>Eqg3KTMk$bS&mqaTTWT-S=(AWS-V=hTYFjiSo>KASO;6{tV^s*t;?+|
+zt!u37tsAXdtjDd7tuL%^tj*RB){oZDnJqF~WkQ+bGqKF3%oUldGS_CV&)k@~C38>a
+zzRdlZM>CISUdp_Zc`frs=B>=TnGbBOZEbArZJliKwyw7Bww^Yr&1v)5@@x at Xp$)V_
+zwjx`x?WH~5-r3&G-oxI at -q$|BKFFSI583nWL+wTOV*4=raQg^*rG1zEqWzNns{OkC
+zhW(cPuKm9KbJpN2PL?1`oF&UrWF=-LWu;{8&$^uTch;M%=By7{pR&F<;vAhE at s2)@
+zevW~TAr7{K=P)_Uj!Z|EBirG0cpN at QnS*xBbj))sbS!Z+IhH$qaIDVuWmjfbWmjj{
+zWY=a-$ex@%C3`{k-s}U}hqI4mpUgg;eJ1-{_Jy2^94d#-nVvH%XHL%ioJBcHa(3oi
+z$@weicFw(=hdGaPp5{Ey`6rj3Ys}5c_2%a1BDod0<8o)^F3sJado1@{?%mu+xo at 3q
+zo$Z~SoSmIroieAvnc=iJZO$xbz!`IvIEOpSot4gd=Pc(O=X~cP=Mv}7&flG9o#&mG
+zoL8K0U2R?MU7cK=U0q!wm(Hbk8C_<V)#Y{#b-}KfYnW at eYmBSWg}W#h<C^YT=i2M~
+z*>%8m$aUCt&UM>$*Y&{l$o0ha!QIK-+1<_E-QClj;Fh~>Zl}AzUGA=OSG&i!$GS=P
+zVt12!g?puYwfm_1iu;=ThWn=bw)?sJizm+0#?#Kz!PCVv#KZRRJbaJPljN~_?4E2-
+zuE*sm at zi=IcqV(Mc&2(5d)9e2cs6^sdUkn^dro=Ic+Ppwdv1ANdER>d^?dMr^mg#}
+z^A7Y5 at v^*JZ-&?8wR-K|Y_HSn_WHaf-r?SIZ>4vXcZ_$s_lWnH_q6wt_nP;H_m=mr
+z_ks7Z_o?@}_oerPuahs{*VWh8*WbtWNqusk!k6mP`O<uTAL1+V4fl=kRr+Wj<D21|
+z?VIOY=v(Y-^6l}x at crX^=lkMs?QiGr=#Tez^>_F8^!N7n^$+n2{35^DpX5*Wr}%UH
+z1%A*E`w at S!f1IE6GyWO=S^l~H?fxD9UH-lP{r-dgL;fTFn}MEz-hm+jK|mT%1XO|K
+zKx!Z at kRC7wOo8lxKM)Lr0$>0Nz=6>LEPw~7027!ISQgkC*b&$j*b~?nI2||}I3Kte
+zxDt32cp7*S_$Tlt*e2LM*eMtv>=GOjWCwXceoz$D1=E8WL37X=3<kr&{9s`a43-AR
+z2PXxm1g8ek;N0MX;NsxY;IiPx;4i^ngNK7hgU5r{gU^C5gRg^cgUz8HA#R8t5``oo
+zS;!pnhe9DBlpiV#RfI-{Mu%!b<3ePJ3C#%23e63z39S!p3~df=3;h;48afd=6*?2T
+z8M+g?A9@&i68aeWk{6fPI<H+`pS=EggYt&tvGY`U$$6=Hx;%ZJGtZOf&kN>-^Gfon
+z@~XqD!fV6p!yCez!`s3?g?ESdg?|bE8vZSOG<-aKGJHCGCVVb at A$%!(C44P>BYZP_
+zJA5zvApAJ|Ec_z;D*Pt=F8n_HU-(n_3lImi2HFDcfsQ~t&;{rQ^Z<GTeSrbMV1Na1
+z03IL!M1Ta41BrkdNCC7!8ejlSfCb0|vVd&B33vcM5CQ<80Ehw*fB+>xDKG-407e3%
+zfw90iU?MOXs0SJV48Q>rpn++?3}6;82bc#e1eO5HfFFR>z*=BEumRW%Yz4LhJApmG
+zKHwMNAaDpc0vrQQ0H=X7z#qT`;1X~JxCZ<M{0-a&?g0;hC%|*yAK(qp47>;a13pDs
+zL|R4KM%qU at MLI{iMY>0NM*2khM+Qa)M_3V2L=sU)G!b1yA2CL<BH58(Brg()6h^=Z
+z6#0sei&RENMu^C)$kND~$nnVe$fd~D$hFAb$o<Hp$kWL4{C4?0@(1Sg^Aqz!`9OX_
+zel))%zchbDer5j1d?J5V{+#^z`3v*6<e$htpMNv|QU05P!~%7Jra)JaUXW2>DX<kd
+z3UUkF1%ZORf=EF@!PtUn1 at j9Q7Bm(7QgEW+PQmlS_`+U=gA2ba<P<6kwS|U4dtr8T
+z!dJG-l<3qb7R94fl!?xW&W_HDE{HCUE{!gWu86LTu8yvau8(erZjNq^Zjb&H-4)#%
+z-5)&|{VjSldOUhEdOCV0dM<iCdMSD(`e*cd^hWe%^mg=a^g;A-^jY*}^mX)I^xx=*
+z=%?rxuqD_E{EGGlJA(0G7w}uK2iP0z3-$*Gf<r(S$OZYJ2$X;_Pzff1DPSs?2Bw1<
+zpc%{r?Vtn90bQU6^nn2|1ct!~SO7-Bp&$$*U<p|Ib;qC*90^u~W58N)JU9`o1M5K)
+zYy@$T1Q~ETI1`)$&I1>Ki at +sd6Sx9g39bg$fg8Y0;8t)4xC`6^{tW&C9t018N5JFY
+zN$@my2K)oO2wn!Sg4e+t;7#y0co%#IzJ%Bi58^{YNCL^BL`V&3ARUwr86h)dg=|n3
+zlnv!VZpaJyp%4T>`Clo<Lm?Q7L0_L<pb=0dG!hyO)j+k-cxVz-2h~Fj5C-883DMAW
+zXcjaVnh!04mO{&*70 at bZ4YUs00Bwf0K|7#b&>rY#=m7L9^c!>(Iu4zJ&Om=a7ojWA
+zHRvzsCUgh72R(ouL(ia>&}--&^e^-u^a*YO$HA at Pc5nx{6C4kBfxE%o;hu0GxIa7y
+z{to8AJeUs)VF at gQ6|f3UhBdGb*24za1Y6)tI1A2(ov<7B!hSdehv5iZ2oHse;9|HG
+z9syUvqu|kS4O|OPfG5NCa0A>36EFoc at C<l1JQrR7FM^lA%iwkJhN7EAcZ%*8Jt}%y
+z^rGlh(c7Ybi~cM6jC=*mA?=WkNIcRN>5lY5`Xc?2LCALq2T4GLhy;-%iHI7}AUY%+
+z$v`ZK4RIj3h#T=CK_raiBT)oG5Tpbdj+7%+NHtP}j6)_Ob;wi%LvVybrXe$tImmou
+z5wa9nj;uu1AnTEh$QEQfvJ=^Z{EQqx4k1U7<H#xG4DttZ5xIg~LvA3qkh{nO<T3IL
+zd5OG6-XZUikI3g(%UJ7JyI99qe5`A%d#qQiZ)`wpaEuk>#`rN&Od3<fRI%h(YAh{g
+zh?!#6m_3#qbH+R|e=HOOVg)fU2FGHtVX?AUMQmhjbZl&Fd~8x|N~|H)7$ahIY<g@~
+zY;J5pY;mk9wj#Ewm{n{o&MU4f-c|g$B&P%|X)4)M@<++1VI77^h9wV!hgA%_RvK5@
+zr8J>bSDINGC>>F{t at Lu~jp4;*31#VJqso}FBW1VB{u?12VH*(}F>=JB5vNC7E$>}!
+zDKGfCqj9|=zJgPst*EN_zG8XBPZjqn1(nvy&6OuB|ETI+HK<Be6|O?6E>_*H`fsFZ
+z<c?7lqv}VUsz$2ItAD6IK6=dPdt<_5s>gg^)3T;#4Ny~FGp^><*bZZbV>8DVkDWXA
+z(AXEXSnZ73O|`$*HjisHPB_ju&Nr at l+{W>t at rC2xPUty7G-2U{trJd7csAkv!~ql4
+z6U`G{6IV>!H1Wu!!IM%ZQIpnA=6vl)iR(;t{<`YAAL<THaZcGW<=B)P^*!rZ^{V<%
+z{j&N!^+)P2)IXUTKegA?zEk^6Wl!ZzO_(a5n%MBF;Y~wx!-s}X4PVffXe+c0+79iA
+zeuH*FzeRhXz0rQ?Ky)z5Lb)g(6`@j8jwYgNRD<f!bTk9Cpf)rM%|V^02lb;NG>k^j
+zLKH+Hv<NLmOVJT%1v(O~Mr+VobOJgFtwX1x7>c75It`tH&PL~<3(>{sQgk`G5?zh1
+zMc1Pn(aq>KbO*W%-GlB!e?fmm52MG>6X<F540;Z|fL=!bM6aVa(3|KT^gj9seS$ti
+zU!bqhx9Gp<2lONQ8Eb*XVXd*YSbMA!)*0)Db;o*PeX#!6Kx{C^!Z=t0Cd4F|981L1
+zm<H2f=~xD4!EBfV%fXzO2lHbg48ZcSC^i%;!eZDkY&ceqRbkaw4K at y&fK9 at tU=3I!
+zhGP`QVAHXg*c at ygwh&u_EyGq|tFX1$dTb-M1>278#CBu*u>IIU>=1SYJBFRWPGe`W
+z^Vmh~GWI8S9lL?u!tP-Au}9cb>;?7;dxJG&AFz+um&UlpHjV8YJ2iH0?ArKkW6#Fk
+zjeQ#jG!AO~u94H2&?smWH%c4jjfsuA#`Nz$<1O*lcssl!9*=j$yW_p^zW4xqFwVlc
+zI3E|`Qe1(n at MJs{Ps0tk3Af^QJR5i79^8+IZ~!mBK^(?o_%OT-ufRv*qw%r$czhB*
+z1#iF`aRR6D>G&*sF1`R?j5pyc at KyL){6~Bfz7^kr at 51-u`|*SLZ}?IC1b!Mni=W3Y
+z;aBnN_}}<#{2u-ge}X^9|H0qj&G-lW6VZZbMYJV45Z at 48h;NCWL?5C*F^Kq%;1CIf
+zkdP2^B9TxN8bU{;6B&esun`U-mv9q4B1nXZd?HFf1VWS$!-;aDil`=Ph;hV3qK=qK
+zU<6K3#57_iF^8B>EFzW?%ZZi58e%=Mk=R0PCw3Bhh at XiA#3AAcahy0soFV=oE)rLW
+zYs3xW7IBw&Ks+X%5ig0?#5>|W at sapK#*uBv_GBlrGue&oLG~v5kpsygB%9=s0#Z!M
+zNF|v>rjS}vPZ~)xnMr1mIi!p9k^wT0jF5%oP_l?DCQHc?WF<L at 97EQU6UfPAJ&BUv
+zlO)NIGsxNGJaRGFM6Mv$kn72f<Q8%}xtrWi9v}~q$H<f9 at 8mi10(qJIll+^!O+FwW
+zlh4RkWHb4Z{6e*-;;F7wcd8fFpBhN9s02z#i76SSq*RoeN};rrfih7xDu;4WUMfK4
+zQ2>=s4W){xVycX)qN=GHY63NxnnE>DIK@!2sJYYvYAN*twVGN-ZKAeP+o|2ue(Df)
+zj5<mEPMxDJQCF!O)E(+R^^kf(J)>Sx&D00#6CFplqraiM&^_p0bbopfJ%nb{Jep5S
+zXgQrot7$E*r;W6kw$ctdm-f;D8la<e5j~79r$^Ca=<#$NjnV`?jh;!*p%>Ck^a^?v
+zy`J7kZ=-k6yXd|20s0Vqj6Ol1p)b&v>Fe|@`ab=Leop^GzoDDy5A-J{j%mZRXF4)n
+zm>x`TrZ3Z<8N#p`F2iSpjD%4#$&7~4G6u%PSQs1QU~(BR<7dK5gaH|ti7~^NGNyv5
+zW@?xT%w(p4X=Es71~Z$P$1G%;n3c>LW&^W{+0OjL>}K{c2bn|65#|_kjyca<VE$rm
+oGPjt=%roXW(>$&1v`*6oPGe1zxA@<Si~B$Cs{23xf1RfM9~egO=Kufz
+
+literal 41440
+zcmdRX2YeL8`}fT3?(N;}?dC4M=hAzF&{QO$Bb|g^LP(Azq+G})6cN}FMFgcu6%nL}
+zA_5|c9lMCAU`3IlB8u1%3#h!$?B3-r1>67q{r>OkM=p1JvorHN^UPDfvp1=(y3*B<
+zlk*P3h#(H}NI(W;LgrBk(;W4#N at s0RLW8qzbV5meX+<Sm8kOLjG{sTc;POX!{>CFn
+zM8@&`x at YMZ%SswbR9tNJ8&ufeG1F02;J#^>joW}EWI?&81L}hEQ4iD;^+f~F9cUeT
+z0PR5!qrK>H^aOemJ%gS{FQAvvtLPwl4ZVrpL7$+r=u6CF0b8()tvC<|;ZPij<8VAq
+z!s)mj?u0wzA-D*Sz at zYFJOx+bYV5?*unO-eUIeeV;Z^Xu8n46a at jZA8-io*5hwvW!
+z1bz}fg`dL*@ay;u{2qQEAH~P<X?zxciGRT7 at h|u?LBvcXVkO}uf<zKKi6hA*g`|@#
+zl1ti=PULEG4JjZ4NFgaA!^s#jmP{lLGMQA71~P}tB`Ud at +)nNwE64`2k!&Vg$i3t~
+zazEKg9wCpCXUKl?EP08%PTnGKlXu9w<U{f?`GkB*z98R{AISysJNbiL=6Fux{5UHY
+z#6 at yZTq2jmrE@u4F4u+YPUdhuxMAFAZVWe;E8}Y5b1moM8o3$VOzuYRR&F7;h+Dzk
+z#jWSIa9g>Z+#}qh+&=CxX!jiVGWRBT6yANn9p^sgzTnPsUvlT+^N-w5Jm!tOi8u2$
+z-k%TP!}$n4fzRMG`7FL8--++c7x3Nr{$vh6fFHsa at niXM{CIu>U&>G6t9TdRz&G;O
+z^RsxBr~J+Qe0~wXlwZxS;WzU4 at b~iD_#OO%{2u;s{t5nh{ssOe{uTZJ|2qE;|1N)=
+zKf#~mPxEI5K?oFrgh(M#ND at +oETM<cQ|KcM6pDq(Lb)(Sa0+#TOPD3xAj}nR6c!1~
+zgyq6oVUuv5aKErq*d;tBJS99QJTJT=91va;UKidF-WJ{wJ`g?>P6}s)&xLP=?}Q7&
+zPr at bPHv={hgJ at 6;eufZ3s3FRbU`RA%8nO)S4S9wxhI~VTp`YP8Lw~~%!$`v@!$d=g
+zVX~pzP;GD-8VolWW*g=jsNqJ#Er#0+%M8m6s|{-m>kW4sHXF7W?l){V>@w^%JZ^Zx
+zu;1{k;U&Y%hSv;-3`Y!a8Qw={4JQm|44)gmFnn$J#&F*7qv2P>MZ;y07fqsB^b^y?
+z3^7y85_83NVtcW(c#U|SI7l2RP7sU5$zr)!D>}t#;&gG2I9Hr6-Xbm#7mAC-JH)%h
+z4dO;|v$$P+P<%|>FFq^2A|4Rm6c3B<i$}$i;wkZS at eA==@jLNnxa$}3S0geKqihT`
+z1{oubQN{#gqA^3f#h7W#GIlU_GUglm82cIr8;2N28b=w6jT4RK#tNeoTGSb*8mAlQ
+zinYf1#@mgHjVq0-jO&ee8 at C$oH9iR6?=<c*K4jcud|1pi?lnGQe9ZW`@fqWO<BP_Z
+zj0cUcnMzDfQ=MrlqtN6sU2nS4G~aZKX`$&3(+bl{(;Cx8(><oGrh84>OxyKdOb?iL
+zpw6aUriaXZ%qOHqX__=$njy`Uu9s#>H%POkInrE7m8f*1G*7xox>=ep-6AcJZj}~F
+zi=^A6+oi?Q5^1TlOj<78A+3;BN~@&R(i&;4bf>gVx=UIw-7Rg9HcIzMo21Rs7HO+=
+zue43NPr6^)E<GUakRFtFO1q at p(nHc7>0xQF^oaDRv`>0WdR%%!dQy5ydRlr$+AlpT
+zJtsXcy&%0Py(GOXy&@fuUX>0?uStib*QGb4H>JbU5$P at IZRs89UFkjPed(z5f%Ktt
+zO!`R7k&a6zq?6Jq>0{{==~L;n^qF)<`ds=#IxBrCos+(jzLvg`zLma{zL$QG&PzW^
+z7o?x0pQT@<U!{xECFwWmcj*u5vISYNg;+QXZxJj8i^*cKd at esPzaYOTza+mbzak%y
+zUzHEaugQnx*X1|lH|4|f5&13oZTTJfUHLuvefg;Tf&8I-O#VndE}xK3%BSRy<xk{K
+z<<s(K@)`Ma`3w21{H1(O{!0E@{zm>*{!ad0{y{!3|0rLOf0BQef02KcFUptX-{jxr
+zKjg~_Qm{f4PT>_nF({&9R7{Flkray}D~jT$SQVS%uLLN8N{|w)geaj(m=dl;D3MB(
+z60O82b|qGcQ{t5bB~eLIl9d!CRY_CQl?)|Q$x^bF93 at w2r?gk{lnzQqrIXTG>7rbv
+zT&-NAbXBfZx+(cefzn;+q4ZRGDZQ0GN?)a)a-Gs&8K4YQ1}TG;A<9r?m{O<|DZ`Z!
+z%1C9DGFlm<j8(=d<CO_Yu`&^_R7#XdN~uz&IF!jsxl*B2DpQmyrCO;`Y89tar%YAq
+z6_?VWG%C}S>B<acrgFV9OSwUrt;|v8Dyl-28<ly=P0G#6eB~BpfpV*|P+6qhrrfS9
+zR+cDBm1W9u<ql<qvQk;4tX9 at 2Yn8i{4a%nB3AK&Y)hDg~NJa|sLsn!%{wM$iq97EE
+zLQp6QL*Xa_MWQGajbe};#iBSAj}lNKN<zsf1*M`il#Vh`CdxwDC}+f=!eLHl!-#~^
+z>Jpc0{Gh_Yx>*Oi?a~Z*4|d(*8c|Z+=zuF>g9-~uOC2s(<)q5$%7&SPE6d#9!M#14
+zwYA_AfVbcpJE(9_NsYtB`hoYo>*2$6XMGiGrT56b83W@%2kb3;q1|w$f!uvN>sia*
+z&f127CAB5xj{0J&bx`4mN|;ZzV`OD*nRB{6Z#NyD?n2s_Hyd^|4C|QD0J9jU&qcpM
+zC6v3H5(_2IQf|F!q9k24P_mzr=P1db+&UGhA|+{*yUQQ(E1#z1`L|#}+M)I+56IO>
+zWaOxV%CRpxqE4tYjFshTsIROoS9u_!pbng_(h|n5x6oDSYIF_iI!a#$hii=frWX3x
+zjJl$0Q8#Th1~xX70HK9iFQWz(Hoeiw)%z(x-8Z4`sM`dXNTaL4S)+dmoa)!ThqKgK
+z(zF_EYQ0cz)CU&A?Yp^D<3_!ke(1W*=sMINbpzIT26i+Ihfy63`ke#OAhlqZwI>>k
+zhM=Kn7%D_XXgC^yMxs$@G#Z1(qH$<Ent+PYL{x$%p;A<a9B48sM-`|NO+i(t8r7g$
+z<V1C7Dyl~=)PNe%G&CK}Kr_+xXcoEw%|>(3T%;n3Zbb9YP3UGcAKii$pj**Gv<TgX
+zZbysJ60{U8L(5gO8m^|Pz10C~p*mWfqSmVo>J92G>h0<s>T30Fb(6YHJ+J<%UQ&No
+zFH?*t7AO`eHc at P&IE3O*in~+Xlj7bK_osLu#e*pxO7RGa$5K3=;!=t$D4s%bJ;g4H
+z8z`Pe at eGQur}zen=TJPCVwK_>DZYu~`4lgpcp=40DPB(T3W`@zyqe-Q6yHe+2$Yc$
+z^E<EzE6_@`3av(K&{}jS$VN|xtD&-1lMS}Y&c^yu$H+m214<@2s?{(xSe4Y!qj29{
+zXg#_cZ9p5*J!li!jJBYy=w7r9-G}Z++u??y%7$u3vDKzI;=QIeR!$q}EE`zjs)7Xv
+z at z<`va06={HO|_~(gDs=5YoZ5{c2!qu~n~};V9ESfSwrWsBKh(RM{W24pJ5WxtA|r
+zR{hif)xs#a3++G;qMc|L+KnE9)=c_gC$O9PH8^TqYIpU0^{jfd*y`V%Z2@~hb+x_0
+zY42SRdwIy)&_g@)2znIlLyv*n4s*CPnzcRTuUb_b5Ti{*-v-cYj|xX=RZU5Kl`gGM
+zp{F;Yr`a|EeV~iIrxV}KpHo?Hfm$mzH;ux=hLQ${-pz~XrA_E1)D8IKnYw3VAArpq
+zGJaHUE~ui0dS`VtQ$Bu^7%{~S&f>|8kgN1w4x!gKqu0?JY&t=}i^@svdz!Qu(5PQ!
+z3e#Edm4U<P2uQ)(YN{Fm%bfB)dKXyp9(o at gMIWFK(J}N9I*v}DljsyWrtyNQFQBx}
+zSzG3)2QF!w8y294qq-VoXIk&-l5(czdet(`Q3h*L*jVSNpH}IZu12cKYLpsn!^osY
+zzULn5QyA()bQ*nz&Y;g>pwqyM!p2GL1`zly6z`?@VT$jC_r=!WS+jCGXV}~2=FHBp
+z&&tbbmtoKCJbU(WbPlHd75W-|gT6)Iq3_WT=sfxnT|hsfpV2QMqZiR7^c(#B16 at W(
+zFvbLPOmV`bwFwtn13*JoH#q8H7dROA9JLLg+5HC<4sq01I?F0c`@yyPX(iRb%I=K~
+z4bEEa#&+7$Hr?r!8IQP^R6|cdlBZ8#4KSq6S>FH~!M#i)fL4vUp0Rp5s!L|VhG?2!
+zJ80}Psy~naKx&ezSi`JDjaL;lMzyOE)&o}L-}joKmy508y=oe(ffRc~MZLpepQO#$
+zUgK<ZIbiXz0qwvdHewStV+mHTu=08btlngeCN(ZTKMiUBsj)UbaNK~#(#o=uKJ_KA
+z=9<J|1^aEneyAJV%8Vn(EVf~P8~{AkSfFjBL^XkFlj)TWr4{;Z!8l|S4q;*n?AGbg
+zn(G=zZxe>Yx8QIb0W!!ef!>NS0zMRI)}DRP+eYE&tvDLTU^|XQ-C!`iHSpNOS!S#q
+z(_vaoGCOW^NtL5mXNXJhCIKgI#)<m=3DkDV;6_kn4bVxe{en}_8k`3EB^~xluNM0S
+zXW&eng|pdy!5M0X+EdL`vrKBnyFS96jy}U3a7T0!Yz!0bHz<Bulk84;AlW(Xm}KX+
+zV^ZF6_Ux0^0CWy_!B=V0t+?g;2hbVk at zwYm+*OnEP3R|lEex5D3vhSb1OE2Jz0hUc
+z2dChEuys%20eB!Dga?CQcr^`U38;gD>dNxk8jw;=1PkixozsUnU6ssH(1o(zG1*aH
+z?<nh4Ru0M?w#0Do(3qA5Wm?1376_-d16-PB3jjrZ`KE$D@=aE(=2-iyJ=AP97v!^@
+znr`JxCL3OA<B{6l-*998<(9%&sK%+WRx4A2%!zqe<$d0Mgh#{mW=05)!DI0_;P_ at -
+z>@`L}Y8iIme2|EulKOH-1H92?2i%FGl5)^n+EmpnurPVBeVAQouXfO;&Zf_F_+8Av
+z;0jy`wxpxlX&j^0-m}tG2YVB2TydSVZg?GIgWfafVr|a2R^`VGZm4k7Gsy!9V?NJ7
+zJXI~&0_)+z4Y(0F(OJD(z4q7@=wZ~%Y(~u-JXf1*m!`R1Wi^gz*P)}mhqKyQ at A|Wz
+zZfe%kt$3l<(=|;!b+!79E~)^{0NeXdJ6h7LqZN3i)={^nj`FRcqXt%1S2KrP-&kw#
+z+Rb<^zEg7!-98-%SjkLS0PU~d>@Kuv6ZjL|^iOx=4fo;=c%w%NX#T_y#%!-H0440P
+zmtJkK32(j^Z}#c~5KEuihL<_&8Y+A&AKnH#`F_~RePAc|Z?%)rNBBX!vuP(Mt9{je
+zu#>^U&YIP}Q--~Bd))+efsNY!ADAG#4>smD-2^ceuBq?qV0-i_wk8!cHaIg~70&5)
+z*pQ9(NhS66%3Awm2*NU5rJ%@bL4}vWCJc6H=Czo8qkmD%ZtzkEz8&6=pVgeVf$Ff9
+z)IAT>y at +4ZsC!-=1a^6_I>e+7YN at AQ!-tym)K?Ur)GcraW`Q+5_0KIZejCW&--7(1
+zK>omDYjh8YP^vP)WH}qlEA0JhOF-XGbJ*R1)`U9HM6Tk}ijvxLN7+@)i9O~fwx~6+
+zCxF;f_+yRO6Y6jvc7!_8qz-RM?C1E4CSs3K{Fc7dpp?6G{Fh7pEzo+b1+Ali)}mr-
+z%J4eKTRZGM2J{=!eQ?3Bp7!Y#u)IS`Tn&y%&XW2vyH2OeOXgvG0ao>Akk~OGv6U^?
+z^aQ?$FX7*s$gEJus^fr6ZO!t)p5(Uc!02e-nXMmqO-Gs6M6laix<Cl}nQ(+B0x{qV
+z#7Ioq&g))MT2&4UQd_2}8Zf0r-~wvz)pE619j{JM$M{2b9jRr-)?!eQ%<%)iqtaz}
+z)-fw$ubgb3>1?!5FR5){J~;Rw_8Fzsm311O8TKl83oc at Y-C1uhshw$eGUaIp&)446
+z$X=s|-&w#7kMlxgY$krpSxIVgRxFX=zY-hqCjlgo1d(78LPALxs2gp<%%x)bvaqhC
+zl!Xi02j;6VUks`U)y{Iwb179PSq*B5I&nndOjwVaaizKsuC)i-0R2aiAl#3{K+hv9
+zDjOVXY5$z8j{1LHkfz8;EU|4OHq@>8loDV{i6l%dRVS+sbt3qW?#`Ro>N`N1TG~Cw
+z-CqXD+(I&S&q%Y(?2g`*j_R@|9Z0fC&Q_A+ at rc}urL`I3nps;~+yJ-a`iK<CLu*J!
+z5UDB<si{q7k8~kdf!V88YsUHH4Lrt-T&osrBHc*7TB|xg)J-z!j_xKsd}70U!CIUG
+zkNcD!ACf%aaX(j~qpqaB1VRv4iheG)u#|xnR!r=FW{0cVh&0I{uk9gu(7euVb*iR7
+zRi{x4<ed=OS3(f)uqRC at bCy;Wm(<m{TB}8pPeyBM(W!!iZ`B%US&m|+cYU<VVKN at Y
+zkYeCXqe|3SjA`zulT1SQk}}}WG?>NoB4&x)W}Z|q&Qy{q>I`+}-{s8sX5=@*ZKScK
+zmxDHwJkrI73FFCZEtHtV^geV at 1&gKoF^%f=6I_kjb+>0Sim`*u(!20rAILm%lg5bI
+z>iibEgv>`Dkp<*dvJjmj^VK<^GUuwQ4Vz5r99?Td)J7IVX74ky44ov)LC~~7ki`+Y
+zTT22ci7U2-fU(TW0eu5DlKHhc at V<S!KQ)(RCHjS|Mi+5DSwq&6JJDq_4+6IJ<Zj)w
+z)I*<})Em{CRSL><w!g76LfUup!J`~iP*!GVZW$2kQ5D!kHeu#k&Kup=Q9aGk0EsZS
+zyVk<Rgni{B5w#9qfnYq_K_1k2wm`kD1<!B>@a!S7$H!y1Rb8lg4DP5kH?PaTvm at k5
+z;K7a-c4QHdz5oQccPr;0ytQ-Cmd%VIFOV037@{s#m$$X&ULgm_tM1)<2t;hDKO}sS
+zx=h=pOMLgko8&M#0{dZy`ii=9Y~RW<hh6i4T|+Ct`c%MY?W3<M@!4prVVfN#A81oq
+zp{{yg+h{&%Ci0Od$wb&RR=VYU$>@Sf&c+62D2lC7&U(m4XxSa`>}$)wfNI|kDXDc-
+z`;2v%d<LudIc(}RpzzkWSVM9a*6<wpimf3ztF8sPzf)ajQrEU{703_de3Ps28^z!1
+zei5^=?cHwSKg~>#i?GI at wOHf3V2#%>x3IbzTtcuDo_x0*(myr!T1Nv*ax*i@(iLOe
+z>)udW*KDJ6gy<S?gX(HyojHS7t#D>w at I7t@Z}c$-oT8b7gX8pE7i{yaEM|<osYEWo
+z?SXA>(*xr|xv(bJBw5{}ZuPh(T0*Ct+nxNU-ZU47F2l%LLZ``_z8BcGd4isSvNN*>
+zIWzBE4|6FfhGQZ8eIWZk_{cGr$z^fbK<NGI_v-dh14}AveRMn5UM<+l<#8Rjj$9|M
+zv-*H~Ks}_sqkefMg?)&;>BHF+t^jzu1onuortec9ECkVY8xF3QTCjs0<@#`axqjSr
+zTz_r=H;}x*4d#Y$L)8`PE_ILku=<4hr234yA2#fB>I>?NZ7pUI+R6?0*|fXWhxGkA
+zVTcyTJ8Gev0&6!k<L{a$w&%RodC3*1<tB6GUTVo9t{QH8RNd>@tm-493RxNuM)&1-
+z9XFM$2afMkA6Fl9t7NW5kNP2O=BBF!8$l-*L%{C7o2|&doO)aQx``a%Zua5VQ|i+?
+zzaZ05<SZ`-SC(m5d!ZJ74K4YXLw}$tHJ|J`9*Z_}tI$@jhJ`9mkov4gy;{>oX?hey
+zr0sh*G~+hA_jwPmM-{RN5|qZjoNQZs+6{8`kPn|;QeW2jG-_yLrKW_3P8|o!#B{vF
+zy+&=hF`U`gjp0(bXJO_Wo1B;X)K@(_;stP}xEDF1zNT*Yn}lfU%PXrJ;kGvCa0IGk
+zO_d9n!}~CYH`UjhcIF#Jy~-*Zn$#cn7WWaz=<DiX&)iO`1@~~L)FW+i>Qms<X`NHt
+z5$O0W^=*w)Zx;1%*3BGRdWA`$?cCSRCiMf{Yf;~An$&wE^f=hFOU`?D$uDZbecZ3y
+zMeY*!8}~c+2X`5*RX<QaQctQMtDmT!sb8p48&l;uw3X-esiN&L+=uEhZK{^xJ*u59
+z$I$6*-DH8AWS^Ukt0(lEAo){USp%kFXiZ!91$n8{20P`Z%u+PQ>8$yiE3Dn=U13XG
+z110gve2UKmKZOz!HmaxfSwd9bV`eFA>mqlW!JS<gI<c+3a`;@noljq9{E<I4tDk%N
+ziW=r%h&71g+w61Bza(n{>?HTR{$wxlJ^5Z<rgAC#b+CqCtLK_T=Bpxbck7zunD508
+z201>be&d#7ei+CxU#NcD7U?6rUGqJm<L}(vem#nX=B(qfFiVe-EUIZ1UmWHqqBZ;^
+zFtR^_pY=-%KMO%!iJ#1uGlu{j)9OMO)SsXz<n^QS+&Pzj>PPW)=rTXCg+uT&I0Qd}
+zlh_-|XrLKgT2ODVa?I2-Es)R!M{=wdAj8F)5+DERFxdfw%mhLf03jD4CDO{f_H`}#
+zL*u#7_(^E|8&K1rnGoMR9V82C*otTsSnd?hVz49XAHz#QIruoLEP<Ee_Nda;Vcs#|
+z3x2Ww1;w~cUyHwkU*Yw&C?*thnzzMLmyplul>6`E5Pm)Ic5!pwQp~G%m`Jg;gFB-&
+zWLUp}1;a+$Q)(*9%Bmfi;GLFMrT&fd7C8!}Z3X77P=hHpOqc<VeF<~%iy6<Fae(`S
+ze*pLvtbRtZ5rQDd3{I<r6n61+4U^HFkNj at _A=a2;GsV^xqR2vB{t^CBZ>USLM6m at T
+zU2pW7+ePEp--%vXy^()Pk6!s_`2E1K-Foz at CQ+=YP^tH$SY|vkkM7y1V=|zs)>gd(
+zRFzLKTIOl&L)~HiAn@#vno6-hBQUrHbr=%8{9*oxCJkDmm*N1510mI`Z#75-=5}z4
+z!$00?9|Ca)TZ%&vBh4Qwe7&8ejV`;s<y`iGtn>(1C$p=?leLWq*%^01(i=uVbym+>
+zNB9c;Vg3xz`30j>TgU=d7kiig5-I#S{wsp{ulaBIZ~5=|@3p+d2mBBGdGsOwBY%Pa
+z2^0Qj{ulmN{vtZX|Hl80^Z7r}N&YfAC1C8}e-b!>FSf=23ZlNGyc|LWy&B123%#B7
+zgPgShQz)s1WJ{4=+=k3mUq=Z<n|j$6>S0=V<|>+5=O}bkLq$zXGuGF7T7*EVixrPc
+zp>D}Ck1)i@%CZIsjl;AQWMfS&%lp?mT$R_e;TvW$5JhO~yZSmR%PSfn*V3oHQqRT~
+zTO+S9Z*9_0CMjasSjbz#APgBb%sE}}h2n6E^ZkeAvvf@)#aVz!vB&2d^;Bv+q;s|Z
+zD2{+Hx at xTx;`4L$s~_s+Ou>L44<v|!5q&6_1hXIs7C{yi!H+*9*aS0w2Dnz*1PSQr
+zEM+W%Yu)>3nN-LKGB^R0%Gq^_V<`!tB-qMR5 at a*Myuv8Hnq9_WV`jC_$pu;M(s{NH
+z9AN3E4~1YML<mJEg)kw6Kf|(}j9R_3D2ih!j;0vigk5>UF)(2}O!!xA!oPYZ5km>w
+z3VhMWj~wkDzte0jw<{zIDO-dTz3!}~$+eNaa^XoB0JZ`6k}hPxBtiQCDe)A?!J8B4
+zT_GEG{d+<V|BaA~J{8(AAcW8!7 at 0@r3mt_{LT8~1{~J(vjnGxN7Ov&<Kk+{Sm3<)?
+z(EuS()^xe?3jjmWNACgIbjAS?LcLi*O#@r`5uTe^u3HB<ux9EUN+Kx%*4wS^Km-`S
+zNZ??rwZM*$_HPaRg?~`rXKewo1cDP at Yz+ik!tfUw5+k=GtWBrcZszn7dT$YW>&zJs
+zK0*(tXEV6{4xyh~uvxfH=r0VQIFaHUit|1c1|dZlEDRBb3d4j#p-31m1j8O3DU1?E
+z3uACUVXQC?cJLVx>V7V$U4x^^R=a6CvLrZ5$Fr>kfQz1x&u5pQxz-qVmK%u#ZmOrz
+zz>*o-Tj->pi~0PlM-cdIij(5=C)6Hz79o(sjQIS)<Cjf at _wo5l^5G9c&?xMEp8^V$
+zPlSm=i7-hhh4Kjz9R58018z;HIECV5bppkyMXb00w%=1e5Gu8 at L3{RJyDnYWrt+y>
+zK%qdW(F+9>r?E<bUxlW3nhFKFC{7jXw+i*%!T_MJe1ws)pjDwqXdoPaQJ4<;`wSjP
+zO#Xqnf8?v>pam$-WcoWyEgQ{-v9sHKXFLb$5xIIjLQn;|Nua132$VLUu4S&gjyDVQ
+zg<D`97wGG#vpF|Df7G)YM=5R}pWjn^`zPF8taI1H*mfFYNA_^mK!vF6F9~fy<CW)n
+zm#|*A8|J#fcdi}c^M`uo+9f_e;fixbKZ7J}5w`lwwG+i1wYjq3yuP8dv7y;&^A};Y
+zcd*sg7NN5`ajd at Bnxg!`N6^lr3&L&?HdsPXS<{8RYzZM<saNa3hD~>QOLmN2&|sMq
+zUj>V5Qp>=L at +8HDCjk5dN%8pn6rB(?w%L?e at l4pS3E(7(uVDfh>@HP#2hgV1>^9*=
+zxa}pKl5P}Vt4<tU?lD)sl5|il?U|F+!7WRNgy5}0u%~V{#_RSpbNl#0;VsSW`<CJ!
+zqnUqL0bz)bKLpM(*IziQwRw`_UXa9T<$*VEE*$sx(tX<WrG-y~Pknvqz7zutKrgB?
+zUplwLzf9^2U!lt|c(cqU#Q+4L7?1#-@~}@mSgQ|v%f)S!hmWB(!jIrT7cp0G0Qd%4
+zL{ryPQf9cprjn|cv4^=A;l_(_<7 at 23K@&9YyF8UTZ$rl2Ukym(?gtbP8DGk>1a11<
+z2EoJDVXfH8qCbP#AThQgE&8Llkm4dO{(}&OC4{?l(nFMg>XRA*(PbFB1y_eNt_~}<
+z+TA%}2=eR>22a({c`iE?xAls1Gg=K19vVirqJcTq2D>5F*RdW&@#tobb<V#fA`OU$
+zXi3BvM#M-kyt-pOxYj<%G2MfW at J{?NzZk7Cv}3L^X3IGaFkfxRL0x?%pjl`7+-K+r
+z_jP9XO<?y;Y8grZjKXk at p{ws^D5iL#Z(!*O+W%=5-_RQf?%0yx5=QWZVrwT)VA&+d
+z_R5+XM_FY_gQI$;9#}%9&dzGvc0e7tG$-5vXoOImaGlg*pPRg7gG?I+dDgkC^*TdU
+z&roP6(x_&LzGR9W6i at abftajz{Ffyk!+4;2P)n-I8PzcN5J1^^G8G`E^$m8%<jD|R
+zG at Cki$>7ko<4KAu$6XJ3w6=HS6hjqjMsXFzQ(G)7i+~MIL!EB~TupIJ^9Wd1bALAi
+zHcZnaV8aZ<OdxWKHv)FD2)K>{N)E`Z8Ziuz;M1-c{`!0EKyewYYJ;P>@&=jFf<-2>
+z%~K>$O4Gy0HNIaQ=1#$KF9l6^gfXLW0!zAR5P=pchQo$I&~O#o3}vk4^sy{@g}l)u
+zhr=g1#1!K1hP$*C_=Mt_<7z<!+ggDbZm3}sG$ZPZ6wew1!C(!;+qWQx>tnc2>uVRq
+zv&ZUarxu_D7!k5tI%z-plE%I`=;4OH?>C3>exT(sAbKDpg at V?GgiNs;W#tv8!-fcG
+z_Y9+XBx^XYDOv|0DC{pcT|PH(0dT{M(D7#0{$_AcTPPZDTd47J0}Tf?7VM|^mf@@@
+z?6a7M0fio8I1GIS!(kYF>nOI|<-j3t7l#e+z;N%e`7L7OEomvoP`ovKXgJ2Us$RUM
+z_%@1fhw|;;#)lg|1!;Y!<(6E`WOWg!6A04*q{Yw!fZXya$BuR91WVw1?}Qo6gAHG4
+zG(Si2GVq at oYZ={;FDUSy#&P+wfm8yGKL8tMFcR;843Gw8(bHPRZP;XnQdwj81 at 35M
+zcdQ((wQrt`WjgL1k8CXRl at 0g?u!y=if&b$>_ch!_(Wpt|M-;Dx92-cimfdeH--ksD
+zS|ciKW!AwYh;Y*CCt8sr+C+abKnxUv#9%Q*3>Cw~a4|xR6r;pwF-EkDv0|JUFD8hI
+zVv?9Frl3o>pO`A9K{Tc(zgd6^T=RT%hpiB_F`S7W-~uLc7-&V1RW}5MrBYla(;RMC
+zm)?<fFa;71Ba5_f86p<_x^{A^jS(tq-6QDD*a&d9dti`r&;861hQLzG0O(D%><tSv
+zS$n-37JLIC+E^5CqJ*b-BPECuj^g$HLuRlL^KOdoq4+LJ2ql=}4Ipi^X0_`GadrES
+zd73ZO8NAK*Ie^=P at mU7mr=AO8uLg8*rxC>*l`qnH7e1?f7JxK6w{xVo2UF$qVK$^x
+z+A(BKUe4?mm>v<p>0&3A7y@|uW{NMn!*=m1C>Nm9a1!Gq7ORR~`E%$!I0nFyK)cb0
+z;<aKoSl9xwJ0 at ZebXn}hwxSpf|N7~fC^jbs%>m#QEUK0^E2?j-W!tGtJ8T4BzyTIL
+zi{>bUsM2!>;~V~i;zucdgzd(yCb$Cs_Iai at fK3gYNzdmYYQeqeh&W6vGzj8wexe#d
+z at ivMd06&o8UFwf5lm|M7FN$Ntv24by8?}Ps`zXHO<CC_Bh3KfIIyCrX``jzSC&fu{
+zpnDjDPcnEU#oJlbw~b*VCy!(ZPhC}%Wq1+3Expm2l9_<|1segddxss4PgH1NNU(*T
+z1AH!kSC%wrKuS<Z_JNLu5(W&eoLuRs&uWXZDPol`WjiQ-&{J(;l;w8R;1?Qcd4SGp
+z6-VpHP_Z6JEA*1KlaclSBW-wJXLXr<unzYG7^gcP2j8p`Ds7s<fo;OTpBki>sZTa>
+zy+XinpY<%Wsh>}AA69W?ncJe|dU2L7CA%qps2L at 2Xu^YW&CR<qB{u>k!@ZR3VU+A*
+zlw7MPb72AM09(ZLs0WD4W)Hqf{q%Y$M`+V8ZG>YHfN5pBQLh_ifnY-b!$5AjQ^+=5
+zJ8+Bj%$Rs9wr}<%4OzqXz<d2DQwP?t3-I0}z_$b1MC>On5toX~L^#d2k79^u4^w=c
+z;&0xA-M0eU#g%|BT_vs(S3^v7n(*Q}mdGk&CW?sys37+iqWB4lA5$TpxrNE(<7^N(
+zUm at PD@<Vfn_hYnb$t3X}anmLdp!j-D$Fuud4!0G+Zfv;wwSJ#cGu-{Y>FIX|^xMuu
+z$u6i)8wQCF;S}*<aW4SbwuwMY8O6`2kR5xT;+LVe)`#MQE!G=O(_9pv6rW=2t(~TU
+zJqf<UvmW1 at Np3qW`u;0Ov-kom_e0+0evU2oGi<rb+1fFu&IKC{U>*#c%p}w029Y)M
+zz%%S6E_<0{a%HWfjN$TGLns#1mf3r0t~rDrdS#KhZm at S5)W%-N5NItorAFFoB7p0?
+zq`g4#iyqQ);ebKA91X7BfuXf?t}MxbrxzdglJ*kQj?b%QqqNM7>#CNUNE`W>_>u3(
+zuTXrz160)1fqu53eHRve|H&r$6u7$AJM^oJt1mOI<`wy%zZ>AZmCGHx=)oG}ImBtz
+zC7}8%fR!cXfV66pMdw5fi|1MW*C;;JY at +%pguhhD=V7Azyc2z$P4pm}Xqlc6VEWXd
+zZR2`4oeq+~4t8hRSp>$uaBH(nUB6`(u+8p*GnrNJwG$LNsA>SNm)WZw;CE=JHS8|$
+zX^pHAaGDG at Sj$ax37^n5(PeED9Z`q7H_=Bvo5;O|j64H)1Q-qY7{A!i5z<B%j20Cv
+z^V at 0>#o#UgJ$=+M6u;kc3&EiPqt$5BR-2uDfGzY6#qTy{u$c1i+__0*{>iZbV<<5g
+z4PGX`$C&swW8zF-CdRRlDo$6NtZb_>ri7K<UG~YK=vjooOu;0;F0%71jK6~mNBJIn
+zV6614hd1BFu6jz#lNw>a)w^1W45QX=)RQu9YL8O<fhR?w9fHuDsrH?i=X2#V5XKZB
+z*5W1hLq_cTjM(u#8?{xh245J?@v^f{9#z1^x~|^Y0B7E-Gk^l`0SIQ%YeBF|s;8IC
+z1Wm(0o1i~j&Kif^*Q{ra@#gzlh>I}?Qcj?Ajd_~5oKOe3#pUZZ#H9;3KX||KYW|?H
+zt0BVJO@)Kyr=TiJF*t7{DgL6Rm^=@R>tXDvi3uwcgP43w at h6^aRy$^=I(biz{E7Qx
+z><^r~+RM358Rt$h&fVPH{b_Ov;DAU8oDuOH_R%+=u8m7ebbSoIj#eqwJqfnyAgReV
+zt$t7lK5PDv`&Qs=Ng32~*wGXC%I$G5p{s0YB{GciLZhDFaZ~;o#b=sP4uaC;Q$UgH
+z3f_@%EKuInOZn%F^3#m+o=h^_lhf+ouoLth!NeTA2$!=y%MO4fkeCWEF}hro>A)gA
+z>(g4+*~CkYWxh*xmf|n9i9-^VEm<ec2l*@GXsm*Hck|Bs9GmwSY~J%)tXRE66L`CG
+zvb_Yr$I~^9*?PTz+ANT2#(S3BVSgE&u=^eQK_YufWi1 at 5DJf$;^#)}NUMt*?VK372
+zBGvjQM?+~=>d2A$Q#K&p at cKJ|(`H*?8f*o1t$QE*?$MPq!ErLYLq0R!V4Q87!;%H?
+z{Dbc({*mIAI3#iwn0TXc9%G`GG61>%p5h-MWpJfMz7?2tgO^$78MD4)%-TLcGiOZ9
+z^yLO`0*nB2bw{zhfD_!tnIMepX(pNOI*MjUvh4jPYYftzhh&$%-w-CifCq4Sd{3rM
+z9AJ%@;Q`fI$`nUsEu^n2%b1T{S^)>7W`gnoFq+#R^;Ii6T3k1`Fu#_2K;yzP<8ogv
+zT%Z{6SP=Fz$PgHb&fd-cCjo+SEpTVHmpeZ*?)=EOvleJ<ihQn=MzPnx^Fu&Mx|~3x
+zr#TZJN3E+7LLs+z<#NE50cK{|HTf*lPn<zS<&%-oNv?<NBJjT%FG`>zT^EB*a+I~n
+zjC+ime3=2LfQuS4z-4D4b7rm^oW|-uSN4yL_X9WPc)4+japM=p4e*cHYU;=1K#zfk
+z)Ru$9vWZPzQWoH+b-FcA-MCv^xkX&52NPpv<$1CLS^xrb)XVZ+*mQGqJAtM1g!>Tc
+zX_YfAy{LEfsBzyW<39JpEcE?W<fwsj&J7NC7E*I!z1g9|1_7-xKFtz7!&t&cg!GWU
+zy2T)&T4lxe+ at cZEL&g_a>-Sk}llLfEJD)y<<Iw6=)(Q^fQX+ZkS4|ZwR=)BUv$XAQ
+zJY;;GlGI(+I{^OL590md;Mtxq#Db^v8+pNa6rIL>gpT4@;!|9na2<eS`;bGpfg3FD
+z!`qBki-p1%?y|U-`vdRfdy0o3&A$dvl;v<>;;hi0>=BNORb+>uBcPBw0UrM%cZ7T<
+zE(4@{7{0*uh4WMSVn2QbIf^s5p^#}<V(5wok at 3Q(MvM3mRFAWbv(YiGKOD2&&QIhn
+z at kjWB;!;zbv72EE_d8U=KjuyummB8^1GtW)8#hES<738HahBm7<0kAf95c at 0%=mf!
+zS2zc7E7yTPL#7zJ!cm7tqYdvj2xLCjncoe at y(h^Nm-B_<!^R?G85}+PihmTJ5G`Uf
+zPBGpf<QwX^>(E+*B#t!<;uixb_+gd_fdumbH5%$w%!M1LE~Z3gYP220g5X0CW2ulR
+zNd)llE;zApwfY=$mmxv}9|Epts9!KY|1-6p`ZdHXPz`~k?S1M`>ISBabJT^ff{<WP
+z7qGPaYj8s189*Yx$+YlsI1#WFPOt7!XRA&vq~!qYm%)<a+qCd at BAmi+gbFK23Iu2r
+zcToY6 at FS#So>YgZ7Qm981n`>X$Q-658O#*a5LC##w^v81M?htP?gl6c9LuOxA)Jb3
+z-th;JApj!)TUhN3*<iK<H!|lb63$Vm>H&szn91z)X7yTdjG3o2Or4{CseuK-Rr*A&
+zf_Phnf-?lFXTZQhW_BIm1DU%He>brZ_B#z0Qv=5{Bq(D-)<}zP at n2>^$$T-!RAzFR
+zCY#Dx7SvQ}nqsO#mrT{B8dEJp+W->EMoBy+NtF1pBq8yqM4=?nDp8U^iB(GzYB-!c
+z$m4;RlGg#0QaeC+LYgp;8KMGj+6WRw`bk9=`a_P;Z81%a at N5E*r741$%+u%wl4Dg*
+zCc<<B7*v4C<pU-ug#V4<e*gu<1O<>)c26HSLH>;g{)A~JgF&^l;%5_TOHY897MO0`
+zVuCCPdtL{7DvBGdbQHad*|QzqLr3u#^r2}HfTql*#ik|bq-iO<TMnrVcsNQaST_ws
+z1#qPZO2Q}sEK+QIw{PE at G7&Hgn(ot>p%0$R(2al?n?0_$%;|wY>CenDtun3NYFga{
+zIPid_9Q7Y~rXu9Dn9N-`-#wiTK9c~rls<_w#<FL%Nw5+&tU<1BGBwy*ho-!aX)|Ng
+zuONSrvep{vSw*cGIF}j?T3%MauAPoz{<fy7P4}7Z-(tF7=bxSc2TzivX}|<{R({kB
+z2AqY%uWW7L8DXZKsz6DK-ob8s=OzpfWN at ob)5E&@MBB+B$RQmQ_o5?EdOiUMzz?Aq
+zP$Gi_v$#)u2-M;k)`rUi6?X`d2pJHL922fX+aVRS9dF}0iw{H1EC$7ZsxyN^Is<v0
+z6JjB>JHeT`6zFX`s5$W4;CNF2K0ywV`Ed65G{2Y}5|?OWpN48)Hj07Z_5{ul2H+HO
+zR_q63?dLkd%(g>y3j!b%gP(_j<#wSzKE at pZ2k!>{4D_DI`okwc at eU_vjdSoIZ~)J8
+z9mHiI(uc at AE(QLM$InC0gTOSv%#BCkuKD<R2vw%QEPCP$V^?s3$CJ<a-QrT9+=4T}
+z2$&61*vuh?Jd9BSDrgBPBM|+UnHC)h0reQTLYN+CugSzgmRGuuDHYcA0Z?a4K)+=`
+zNCh_~!o>{u*N3SWP$y+j4<w+}HiCv>w=7^v<pF3i98}bOaHj<{8K~4PptLu`#U-Ga
+zU~6uHkY8N_`VuZcukdjKJc$D)(FfW<DlQM6O#^rBgRcjI_Kj363>~b+iv%Vzhkecg
+zkjR^wPYj-M7z|dW^$z2M;@!n=|AkSs2+lx)iiDJ7EPOwkQ5Fk at ra>?eeEYUW7Lnoh
+zIjsLvOp|Vb69_Pg(=3K)WJ=!*SxYv%bwC*O8_QHSkftT#w=rVfqG;}?iQ)>6B{v!X
+zUU5SF$YaTcj<`>AOK!Ycx8%5?xg{6+LuL&uIfww^%MC at sak7W(5UYGGxwwpc_E(nN
+zXc0cWk|hTb0b6dEV(jL%<-!2tyw<jyS#tb5*m74(TMm}Ik<15t_<pXlLGajeQmI+<
+zGGmd~mJ9jJnqSeDzYUh0nezi)TMh~u%y~;&&eljb=IYgL*zz1O=b9~F3$`4L>0~BT
+z3z;E*u$e7qmVC|MwB;aAV9x)<mNVJVtvSf{7tO7C9vJj1SaY{69|T(k?0PF}&TRR$
+zU_#-r&Oo-^hG~fpw>6*Pw&!sDOfzc^mQ6S4xRo{cNa-nEO3fdeKQVu5K5hQYe8&8_
+z`3v(|^Oxpx=C90Oo4+xCYyQssz4-_8dGn9v3+A89KbwCs|7yNyzGVK*{JZ%N^JNK1
+zSRxXK4se+gIA at YkGD&7hk}Q%eDUzRLm28r~6d(mkK~k_3B85s}Qn(Z$MM_apv=k%R
+zrC2FWikA|kL at 7y1mQtitDNRb3GNeo?OUjmVq+F?;)LzPyI!GO*PEu#7i*%KAwRDZt
+zRk~K{Cgn>7Qg^9`)Klsu^_KcbeWiZVby9z6fHY7VBn_5^NJFJzQlV5N4VOkpBc)N&
+zXlaZzRvIUbmnKNX(nP65nk1D<Ws*ahER{<YQl&ISs*<Xu8mU%tN_Emysa|qP4U}Y3
+zl0`{2B{`JjQUX3^drI;s=|D+GN;*-}nUXG)Tt&&%lw3neS4ys>q#GsqloU|Xosu4u
+z^rWO0CA}%>LrGssKvi5vNq<TPP%@B`L6i(uL)7~z8A8cWN`_HVNJ$YT!zmd-$w*2@
+zQ8Jp6F_es at WE>^qDVab?F(nfzDWPN%C8d;<QR1LvG9~4dR8Ue$$rMVeD5<8ThLT!J
+zoRrj2GL at 2gN?eoxZH<&nqhvZIGbou!$@P at XqT~ijW>W&*+gwUiN+=~aQgE!uO_bbB
+z$$Uy~p=1Fiw^Fi at l0}r<M#=4zET&`$B}*w;M#*wY?x17^B`YaeMagPP)=;vRk~=9`
+zM+p>(*HZ$%;08)IQgRO^n<&{#$rehsQgSaP+bFq at 65z&mN*<tO2PF?uvXhcsl<cPD
+zAxid8 at -QWPDS3pFM=9Ay$zzl}PRSFLJW0t at lsrwzGf>oK{-X9Q1$&BiATSktN}p?<
+zBe`%nNqat`y}NUUJ>|-eo`Z%1*n_t!OCi+*v2Du#tk?$K-O{YP|FuLk%p^{KI+cc)
+zwx_g((St at Q%^LkFqk3x`>dhYS;_ma`6jfl%sjWKt4?m*^#tiY1673kX{y2!#aSUTW
+zq~2K$59ozj|J6m#Iy;mo?aYI<r)YJ^47*+~$?z!&WO!hX8Fo(+1O^G{3pusx;V46i
+zc05}<5dra#&(OY)Y=ax7wc>=Yz_4KHKT-aHfoHZFm<{${C_BQ~em?wwQ5oMfv_5-s
+z92^R=r!b&Q>e!|S^JI1az^KnXJ}?t_Y(VN5?W+{Mr#qVMz82YHhB9N>(Eo0JALwhQ
+zqTDCp;c|Vm$^MsCzMYR=WXPnyez+UVG{}ejO;6^7>!r;o_>Vv?V3def!m3?hCqaD0
+zq+_wQd$alcOZAlML+qa(riQ8IHB+B|lb>UCiDd_tp^M<=!tXBa!WZGK$o5pwQ%5lM
+zl$qCDxA;B?1#VAoHnl%JXbi0ro3&<jW_NDe7wHS_ at _fXnH41t<!xMQcr0x>|a9eb<
+z?pr<~2pUBC^xMYQ<*j(}pAxnnJ`-t8pbujE$}n$Vq3i?)K78a!&t>~IfJX)Sss}*m
+zX_&@Tw~#RN1ndcEvPlfBW>0a~px~Qk`}uD at l?QIpRd9-ryA;`MfplHuDUHJoHO)5G
+zf7)F8=ze&daqy5vSB2d at zm$S9{b5?EPHQk42oF=Qg{Q6AQ9slG?`z;)N?XrgLqJ2c
+z2gT<#@H#U!D-R8NG~<D1@&D1`ap=WYS2jHl%DrQO8sEkCJg5ZjYG}sb=7y_=Ilb)3
+zn^4MVc1q-bh|7avnex$n9i0`rrvqQ~YLgfL at Vo=`qkHTrnzzN2mMe7>oVwMX{Z?$P
+zYDV;b6vqHl>G&5UT~T>8Hk;;u&rynMrS!aZFB3#579J*RA71C#8q6MopYQWfU?6&1
+zv$_92Tk~}94^W2DKH9SN<Bou$jAqLS`T9S3Kx^uF-PF3(Zm~7hN4x)(NwoURggp=j
+z#*S?^wjNUH-MF780BvHL4bkd}1F7SB0|FIl>Vv1ld3<K&o9{p`-X?XdPo)GDM>933
+zA5($hmNi at 8=88kB_A}7Qe-j_U*yO{xHXlO+ZT?iaK at Qs7tzOqc+pJz*d0+|9vG206
+z=NrML2U=~U|93ZnZtDS~?1_dvr*nahr&`hR{}05Y#mZ=YjgOu0?DM`o+i2S369I~;
+zSIOM*xb7-5I|ALc;fnqp`Ea&k;(yxk3~4pu|2WH(;G<-&1YQ9awUx5@=Qt1OD5;s^
+z`;!q{MqvMHv;bXe`=~z`%purEt9TzY4`0}HvCyA3p-D<}H_P+bI at U*XIy}B)^FXS_
+zxCvgV({mFU9{epNf80msp=;k1MYA3<L7NS0rlpw+F<nEE0S1j(h<|~;V<Y+qK`W1a
+zQ7fVIO)&gdL9sAZU$58mME=wX?&DM1k})oYG&6Bc&mw~R(|kz%3zOg60=R?h44?bm
+ztZL~@Hyyc#;p{%muaG!h-HN|0Z14YCwn+~_Qd-GiXbVrHDRDWvDb?0|p_rI at k`&G4
+zw<!-%Y+d<RZ1~@RXu=APXf?0 at OPj7m#^>)w+#$^rk5{zyOiueTEUD?zj?9ho-4&qR
+zM!-pHIN#};QH}t|zp=^hZ|U+s)@-f*zw!_Qn{mnQ<NA08kn!@34_g0_7OZ?$vp)XD
+zW}neYRGRPPn*Ut*9q*%OuAFl#@NK34NQ39x!QXqNU8=iOY%xNqc%$co<oiL<ipWRN
+zB6LG@&?36gcvOcu0Jf$cO)_51;EHf!3P6fz3Y_sSN4M(0L^O-R5*Z*7-Ry-UG9V%v
+z=>;NcAjAo1DSw2!gvK%eA}TY*p(+MKgrClHp_w`m5fvGi3j<I!10f=n0T3DdPzNk9
+z;2|21CK_!35)-)2s1T4lGsNYj5<rJ#Xc_qmPIg7ZPs!a5&-5r}FhdQ(QHSP{7le+0
+z*_nfG;qr9wrMM3*(ZL!X$feL<2Wp_3&~mZ^H2_Fs0Gi9dmJFVu!z<wj`zpjGXaNIb
+zpizJZa(G~sXgXky7Nc_RcQjZBU!eKi5HyYfDbX~;JBDL`_Nhgs3_yu)Lqp-ndLwQ`
+zWAJ`5p8+mV3H)&2R0NO<V-W*RqJ^SG$ah06hCqgE7#abmLT97N=z2u8-_&bp4WMK{
+z!v`=JH{Jq(KJYt!>aPrJ0oX|foCLHa{Nx`%D*#ln)B})&U-Z-9kqj6Kzu)JBi_`#-
+zYCSw%!;6R1k&saJH2?%sJ*fhc(Vrn}e%FAIA#N<>Xzk|%r??T3YN3XS1QbOm1MUDc
+z at dh^z5<rk1&;($1PQ$Mi0s!+}4XiUv{StoA5U>~(4EQ)hLn?g<za6NqW6+3A4CA;O
+zV2<i09p%U%rP_}dstiV|<B{N|1pt21;G+N?Wj{aY29A0$qYQ&|AHa(MO9$m~GXt57
+zU?3Afid?VZMFA=b&#h$mQ0?atMGYXj&<!PN09eyy4=R-6QU)RcJ__)(TeBN80>6g{
+z56Qm6g8&_`fk1C(IHjKOgNz3N_5{C=2tVJr8GdUKpdz;bP6Xg0BN^oLyb62*B&dnu
+zL;%#Np*@!~z$bhD86c(@Is{OE-PPVI at EY)*(<nyTk2KEl?Dw<!7Pow9IcNFG^0nm~
+z%eR*AEZ<vxu$;I2Xt`kd$?~)17t61fi<V24-z>jd{;*t at k&I;`b22XrvOyMQqimAR
+zvLst%Syp5}*(%#)e>p%7l!N48IYbVX!{l%|LXMQ9<Y+lYw#%_{oE$GF$cb{2oGhov
+zsdAc}E@#M at a+aJe=g7HoJGs4_CwGuL%AMrSau at k3`D*zZxvPAw+)d7x3*_!{54oq@
+zOYSZAk^9R1<m=@A@&I|DJV+ia50Qt;!{kD_NFFYakVnd+<k9jNd8|B69xqRji{*)O
+zi9AUzmCIy at JXtQ6E96Rfid-dE%QbSX?3C-|sdBySk{jekd73<3o*~baua{@ZH^{T)
+zIr3atm8pEAJWsw!zFD3x-y$!NZ<QCyi{#tn+vUab5_ze-OkOVEA+L~E%B$qn@)~)q
+ze5brlzDr&&-z{&DH_G?Oo8-;%7I~|Due?pZPrhH?E<YgekROzH%Dd#<@<Z|-`C)ml
+z{D}Ohyia~ieq4S+eo}r)ep-G;-Y-8ZKS#+6l)OmEOO(7!$t#o`pyX9b4pQ<OC5I?^
+zosu^wd6SaElpLYtElS>|<Q+=hrQ|(I-lya!B_B}oAtlEs`G}I^l$@aCBqgUP`IwSV
+zDEX9<)0BKh$r(yMr{oJtKvZCZoulL{O1`G#8%n;V<U2~fr{o7p&QtOuB^N09iISfw
+z`Gt~SDY;0=B}#sy1h)Sllw779q8z3i{E#e1Ii7L?<qVV)DQBddiE?JjNtCltPNtkf
+zIX}u-DQBacKji`_7f87v$^}y{gmR&j3!_{(<sv8-Nx3M>MN=+ at a(2qaQZ9~i at svxT
+zTq5O?D3?sR6w0Mi4t|<8opSI~wV9O5qFgrRawwNexptImPq{qGb)Z~F%5|b#XUcV<
+z+*OpjnsV1rt}ErPrCc}4<x{SJa@{G{gK|A7*Nbw!Dc6T`eJR(Ea at SF=Kjj8cZXo3b
+zQEo8hhEQ%O<%UtNka9(o8&0_qlp9I8QIs1^xiOR*OSy5B8&A0jlq;s(M9P&=ZW856
+zDOW~02jwPHuAFiel&hrN6v|amu9|W+l&htjlX7*Gn at YKQ%DE`lK)FWBO{3g&%FUqM
+zOv+tPxmlFEfpW7cH-~a_DW_77Qtn2|&7<5+l)IU7^C@==<rYxxR?01;+#<@|M!DN5
+zx0rHED7Tby%P6;;a(7T}1?5&!ZWZNLQ*I6A)>7_H8{WZw>UW(DSK07Xe}osru@{M5
+z9Lip9VK4Wwm&rC9Wy31_dOv#!wBa=C>ox*6 at GE=U at LcOE_U<tozR^a)+1pC%i>#r)
+z4ew%qpJvy#vUjo#FSB8*HNb|avx~XxMf=U+ZPq0=+|fp$^YPXNHe78Z!R*WJHhhB(
+zZ)0!oWiJn~Zr~?AXWDR{4d2Qx^|v0fVUfMNj=kJ$eZ=!Sd%xT8LUw7G4JWd{kJ|8U
+zHk at rE*RoHWtn1mIhgpwdHWFgPnKqovE^V-3Xn_|**zm(PJj;d^c2%^_hl{toXCvCj
+z0XBRSyPU;d*4l7_4cFQ5X7<TpBYxI5Y`DZmEH+Hpr9$?yk97*;%&}gu3hcs@>;nA!
+zHNWy98+Nh3o2{=|=dm|C*-M3WnLpx`avL6JBQTo>t(~potkl}YMq+GuxeeFYNLL#P
+zWo;j~;VrDYSoQ)8PPM|SO|oH)$5U8~2W=#Z{ViuN_uB}x<X7fcL#+2(Z)9)Ru$L{?
+zt891zd$-3%B5io04bQXT1{>*S!>|~|HoVwI?Ckr#He7GRx3jlTSr6K9fsKS&-(;hQ
+zS~uI^5vzEob)^kI#2SFG;RQDKZnq6jV;{8DZD%71Hj-$=AQ&k&3?gtdYqNm8?6Tq6
+zHWJU?_Oan;_IC(->1TtUa3>qK*>H{xgIw_|2SSgxfXwkL=i5kt^+)#c6&s$x{=Q^g
+zYQwkKuqHlFz;Ac4(P3F&G5M8y*~=p~yht;vXrQtVeh|WKVij<Pn*3`8U~udM{Ia#O
+zS=q8l*`odEV88DAuTit7fg&UPTzMQyM!C?c8|n$ZT at jir-Y4!9e>EbbXbdtY!ztLI
+z#_`5V<8(L|xYW4A_=NFw<4NPMCeCCv`I~}Fp{58^w8?IYHzk@<OzEa9Q?9AKse`Gr
+z>1tEHsfTHRX_RS<X&fBtaGIu?=E8x8Wv07Kn at x|Ho-w^*I&6B^blUW at 8JQ)sY*x%6
+z=4f-eIoEuZ`5N;p=2y+HnO`@*X+C0p+x)Kiee(zAW9H-LlK?gS6kw*G1H|+kz)Qac
+zXz6)?mHq;7(mw!3$^(4V46sovz(s=rCK?Iw&^UmFrT`o?3t*sm0ROxSV4wK__v{TY
+z&jA4M90st?Q2^(h05HxnfNxF#*k&ETHK$24r5mK%rFGI4X@|5^+AZyo_Db(c$EEM3
+z-z;WJpe5FlVo9 at PSaL1xEuAe_S+22MYZ+`AVVPtpvrM*BSf*I!T2#yJmb)x>TQ*uY
+zS+-lAvb<zDXgLm!&{yCDeFyH11>BfOa8Z)MJ?R84#xQUrrh at Tb2Bv)_nDw<_oDax{
+z<@e=N@|W^Y at -Om5`8W9w1uI11l_(`eNmsIzTqRHGqzr-Iv|pxdQ=U>@Q%)$~DVO{N
+zzW~2Pzjl84e!cwq`1SMa?>EqIu-{O>LcigDBmGAEjrE)8H`{Nq-%7u`{WkjD at ArV;
+zPQNGpUi5p_ at 37woexLb$?swMj2fs^JWDT~)SW~PWtlh2sts~&5O{KNYdV}>=>vHQ_
+z>u&3F))%ZVSzocfYCU89!uqB4E9*DbZ>`_k3^t=pvMDy3EzLI5w#s&&?FrkPw&S)l
+zw$E*6ZRc!X+rG7ZZ#!?hVEftjtL>8QH{0*<qXL}2;BWSi at Q?D3 at sIUS^Uv__;NQu=
+z!hfp&_5P~=0{?~nxA`yjU+TZye}(@l|26*i`0w=J?Z3x=um5xY at A{wcKjnYU|409y
+z{4WRK04_iX5Cif8ItFwOxGLb9fNKNt1G)$F4Coy&G+<7E8gOI4O#$-*76dE|xGi9D
+zz|w#_16~PuHQ=>?*8|=RI1=!7z`FtO2Ye9lNx->)9|GZ7;eq~vA%XV5%)o-cA%UX<
+zCkHkJULUw9 at b<tZfy)B#2;3dGCvb1zqk)eFJ|6gF;M+mQAajr<NC~nA`3D6C1qXEt
+z8WmI-R25Vc<P4e`v^Z#K(DI-aL92pR2dxd-8MHg-;h;x at 9uImeSPV7=OTlumU$8AW
+zAUG(vV{otF5y7K^#{`cHo)A1Mcy{pIU>ZCx_@?0b!Rvz82X74C9DHx^Gr{MBF9iP_
+z{A=)~;NOEUhv1Nmkgg%!LJC59g!BrT6jBy4Iiw<FN=Q{mP00L^Z6QyFyb|(i$ZH|5
+zhrAhbB;>u2qoG%Y_75ExIwEvb=-AM@&>5jOhb{}<5PDDO=FqL7+d}UT-5vUL=)usp
+zLf;8J6?!)Gn=md+2ou9hVNzIhSbA7ySWZ}%u<l_+VdKLp!WzQnhAj<S9=0NERoI%a
+ztzp~3?hkt)?6I)t!d?hF5Oy%^P}qfVF5DXKA08MU6dn>D8Xg`V86F+pExaJSM|iLB
+zKH>es`-e{qcZRFsH-_I7K0kax_`2{N;XA{3hwlmB8~#%GE8(w(zZU*__*>z}!jFf4
+z5`H at TOoU&AEg~QyFd{f2BqA&#A|fiHcf^p0VG%_UBO*pcjENW*F(G1Ngfn7B#H|sF
+zB5sdZ60s~|XT<J^JrR2&9*uZB;)#f-B925Hk2o3eNyKLnUqq6~PLcVM-6MNO_Kxfu
+zd0pgy$U%{Xk>esAk<%h)L|z|xQ{?TDOCr}q-Wj<g^6AL^k<UfG5cyK%Cy}Qk&qRI^
+z`DNs}$giUeQCCNGjp`Ov5Y;29S5%*<eo^D1W=1WHx-DvP)Y7QsQ4dEw616Ytsi<e7
+zo{f4w>cyycqu!7DAnI7u at u;&==c4)Opy-h3u;_^BsOYPruZg}kIzPI5bkFGC(L<u^
+zqG|NJ=$oT&iM}=Z-st<Hw at 2@Y-Wk0s`l0BTqYp&C7X3!_k?1dDVq#)r;$sqHl4DY1
+z(ql4XM#PlF)W<Z$OpBQjbA8OZnDsFmV(y9A9J4iMTg={=M`Ip~c_QYOn4>Wt#(WfW
+zBIZ=g?=hF{*v{DnyTNX>$J$5ON7={N$Jr;?C)y|3%j_=uP4 at Zr1@?vZ+wAM at 8|?Sk
+zH`}+`ciQ*aAGg0~f7yP(e$al%{)YW$`>*y(_TTN7V{t4OE5wSiQfy#saBOyLZfyJ5
+z4zZnLyTo1{+cmaZY(Z>~*j}-HVk=^&#8$`F#@5Bw$2P>yi at iB^XYB6SJ+TkRJ`($A
+z>|?P{#6A`KS?uSrXJgOBejWR5?Dw(fV=u)15$6|YiwlSgiVKOe$Hm2^$7RN4#pTCU
+z##P1D#MQ>t#Z8TK#WluFk6ROWXWU(JcgJmv+Z4AY?(w)M<4(t&iTfh%Y}~oHuj0Om
+z`!4Q>_>lOp_=xzZ_?Y<E`1tt5_^kNC_~G#*<44DjjUOLh9A6Q?EdGx8mGP_M*Tk=l
+zUl+eVenb4T at z2M<82 at tof%t>*hvMIje?R_of}G%&U`q%{2ucV^2up}ah)PIGNJ+>{
+z$WF*j7?UtAVM0Q2LP^4;gtCOm2^9&;67EP?nXo!xZNj>Q^$8mi?n$^e;o*cw680rL
+zp74CaiwUnJyqfT3!dD63Bz%|fL&A><KP6mB_&qTxF(olAF(WZ6F(<KIVqRj$#IA|G
+z6Z<9(O)N|-OPriokvJu>I<YpfF0nqbA#r8m>cq8)>k`)|Zb-Z*aa-d3i3bx8CBBh(
+zIPtB-cM{)AJel}$5=r8d3`xc$bCM-VNeW21Ch6Lw{G@`U9!WiudMEWwx-O|IsV2#p
+z)Q~hSX-3lZNjD^|NLrP&FX{25CzGB{dOqpJq?eNpBz=+eWpY4rP;y9eXmWURL~>Me
+zOmb{;PV(sFvB~3;i<3)|OOqYR<;j)FwaK%RXD821rpXJFZ%ba1yexT7^4{b}lOIcd
+zBKfK0XOdq at emnVS^4a8b$zLaboBVx>l44EqPYFy3P6<f~OKF!<o>G}ol~R-9OqrVE
+zN at +}4nQ~9co|L^QkET49@<hrTDJN4tPWd$Dvy{(MQL3EkmugE5NDWI(OU+2lO3g`a
+zm)aw>S8AWs>rw}#R;E^^)}+>@x>6fbr=>1VeIfOw)K^kpO?@r(jnu=bZ>LFVk!jIs
+z_O!UP#I(G$UTJ;O`la<x8<bX(R-e|8HZ5&t+6`%I)7GV}PurNbIc-bYy=l*;T}b;m
+z?PA(*X_wPUI-f44+tS0+BhwSplheDU4 at n=EK0JM7`k3_T=`+)3rO!#H={Kg|l)gUw
+zt at L-&-%CH5{$cv@^pokIr2mqkWW;2|X2fSCW+Z2H&bTV0Yeu(>?itH69?p0=<6y?g
+zjIS~cnQ at t2Gy7#$WKPeVmpMQ4*38A3%Q9DFuFPDMc~9o{%m*`fW<Hd;H*;U+vzccz
+z&u9LgC1wR>g=R%$MQ7Qw;<J*nQnNC$va{M{b<G-)H7U!HRgqPdRhu<6>&~q8SsSx9
+zXWg51f7XtyU0Hjwp2~VD>y4~WvVP9GnDu)$%I31K$?lsyG`lQ&YWD2xMcKD!FU`Iq
+zdsX(D>~-09XWx^(H+x_9<JnJT at 6Ucd`-ALHvd?AznnQB<94SZ1vE>Bjbj=x%Gdiav
+zr#fd=&itHZId|u5$k~*$HD_neLpe|6ypZ!^&MP^mbI#^`mGf=R4>>>P{G9V!t|?c_
+z4av>O&C1QmZ4W==(I<CE?$}&s?$X?qxvO*U%w3<mA@~2(bl+c5T>l@(EwRSl6)Vw@
+z#F)tT-PvB)UA8f^<ubzziXb3 at f(XLio1LARB^q07u}cs|W5pJukzmEHV2Qm%qu3%w
+zV{EZ}_ngo9-XHG!pLm_evod~l{O0&Q at xR6Ii$4~BI{uodm8i9-ov4GTr>Ku;h$vPx
+zOk@;UL^hE_<Ps%`l0~H=C<=)<ks$h3G)=Tsv`zH0XqRZe=#c1?=(OmJs7drx^j!2(
+z^jh>*+)CU}++RFM94j6w9x3*V$BD;_Cx{Eglf_fSCE}oXhIp2Ep?I-)lek*ERlGyI
+zQ(P~;BW at Hw5dS4^62FqPlC+U at ko1%cmJFAuC0dDIVw6}U9?59Q7)gdCQ!-8xl6)_j
+zE154 at C|NA|S at Mfyx1>h0SF%rXKyp>uMcPf;L)uH)M;ap?ARR1qNNH)RbhLDgbgVQY
+z{Xx1&x<tB6S}xrrt(ESR9*`cA9+CboZIs at ZK9oL|K9O~hb&_?Fb(i&$^_KOO#mh2f
+z*|Hp2u55y=KvpO#mMxL3mu-}7mTi at 7mo>=F%FfF!%C5++%C5^^$cM{E$iJ4y%f)h;
+zTp`Egggjk7R-P at -k>|;$%a_Sl$SdTP at +$cO`62mX`7!xP`6+q5{GOt}VxVHMB33a}
+z5vTZE at uebD!71h`7AO`fmME4fb}4>U)F}2U4k!*P>J-<N-IP6)y_9{F{geZggOssK
+zwbG^ZC~>7%8BnGxCo7AUB}%9aDVHf%D1TH|Dyx)hls_pCC|@dHE8i;LtD37mQngmK
+zQ*}}GRmG@=sy<a=DyPb=N>X`MepRL_Ta}~ARZUQ_Do!P+%2d--i&Q_U)~hzDs#V)m
+zwW at m68Pz$}@2X3xyQ&weSE at Ivx2g|Vdn^VUfDOWiU_-Hym;p0k7R-v-F$$xxR4ffk
+z$0lRNSP2%yzQJZ-%dv87CAJD%gVkWCuzKtab`HCM-N#;I|6%X259$``w(7p>81(@4
+zAa$&IxLU2&stszBIzgST9;?n$=cx146V&<YD)n0RI`sziCiNEeHucZy2K6=dWAzjD
+zQ}sXU7n;tR!J1gjP|c^B&ou at Oq48+~nq*CiW~`=IQ=$oKzR|FnIhuKz1)7DL#hP`R
+z4Vq1wYRxuHo#uk(lIE)By5<k<Anli0i<Z!4Ym2pE?QHE@?GA0Nwn2MG+oXM?eWz=t
+zYpH9kYp3g=>#FOa>#ggj8=xDk`$VVJCFzoNX}WY>wysP!M^~j=t6Q(zq}!s~t=prk
+z)$P|k(>K at m(~I;{y+V)awR*kYq&MrWdYj&%_vr(AQlFyF&}Zrk^+oy;J=BNvoL<mZ
+z=qvTB^=tL(^&9k?^mY11{eAsI{bT(T{WJY at 17ippkRfE?3=u<_VXC3Ru-|adP-i%5
+zIBqy)s5izL&Bg?y&FC<?jUFRz%rVX|&N6;)oM&8MTx48gykh*v_}0|Y)ZaAB6lW5d
+zq$Y(4Gigl*6J^RW6__TQrkF}i$P_Yhrs<}crrD+irWK}2(-zY)(@9gk>5S>T>4NF9
+z>9*;PsnPVr^wiwK+{)b6+}_;L+{N6 at +{4`4EHTT>3NvQbnssJ_nKTE@$Q&|rX2JZe
+zd7Al|rL(20rMsn<rLU!*rN2dD at mqj}w9uAROPVF!l56?SGQ%><GRHFCvcR&?Qf+Cl
+zoVA>{T(n%aT(jIr=$Rl&kR-?wlnLqtO at b~VIiWNGCVZ0+PT&*D5~e0JCH!mcWbJD0
+zVeMt at YmKoEw8mLKw~DM1tHo-yCR&|VkCm|ct-wlIr&vp^&>FIGR^A%1uCUfx_gN2E
+z>#Rqt$E_!AHrrTRmTjCZ*EZ3XZ<}PBZrfnnWUIDqv+c0`V%u%+YaeRY*!6ak-D0=d
+z6YVa0z at BVRv!~nh?UU?9_7Xd^hwPla++Ja?v{%`GvahpmuphGDwcoQpu>WOmvOl%|
+zlL!+RCoWA~p7>*8W#X#Ds>IsFn~Ap)|4eL5yr1|e at v%eVz#U$P-;wM{anO!bN3mm(
+zV~Jy#quf#9Smmg44tI*3HmAesawa(mr{9_C9PJ$MoZ!rN7CMWarOt)U#m=S970wFh
+zO6Mx)A?IP|QRfNgDQAQ8tc!Imca^&;T&rAbTx(tHT>D+OU3XlKt_QA1t|r&t?wRg&
+z?hWou?k(=^?j7!(?t1s%?q}}j?w9V@?zisu9;rv`v3im`DW1t5*7Kcbo at bF~y=SNA
+zi07E+r02BfjOUK$U(ZX=8_!$MhotsNF-ZfG1}DWP4NEd7xssCbQXJyn;4IGLW%yKl
+zIz9{k9-oUZz!%|5 at a6cAcqP6XUyHB9H{hG_YJ4lc1K)}7#%u7s_<sBlei%QBAIDGO
+z4ft97JbnScgkQn0<2Ui!_+9)S{t*8QZ^Hk^pW)B(7x-)ZKl~m3foM*&Bw7(|iI0hn
+zL}#Ka(Szts^dtHc1BoHTP$G`_g7}j7nusUFgp`mIN&+Lagn=*<Rw9vb5gvjdd_;gC
+z37Qy1q!H=FSR$LqA at YcPqL3&iN(e}VqU{5oC?lp4-w`v2*~A=TKJf#wh*(N2Cw?SW
+z603+c#5!Ulv6<LPY$tXSyNMd2me at xeB<hHx#0laQ(LkIdE)bW9E5vo;58_Xv(L2l=
+z=l#Mv!aLF{_R73UuiC5g8og$()tl%Y>qXu&?^N#`?>z4^Z at G7+ceQtox7xeaTjSm9
+zJ>aeL9`&B^p7&nxUiMz|KKH)!wf1%OiF|6G&S&&ld^VrM=k at _#zV92~x4yZ)<-YyC
+zL%t)v<GxeA2H!c~HQ#gJJKqO?3x6wrj9=o{_!InIf2u#rpYNaKFY<@{f`6v}`@pWi
+zuYsCCZD3#EV4yB=G;lm{GH^Q35I7h3J#Z;-HE<*FN8r!E-N3!TgTSM}<G_=^)4)H0
+ze*>=qZvt-v??E%r0<;2cL3_{vbOK#KchC#;0sX)LFbE6*pMYT?4tx%VgArgP5CI90
+z0R>P2HP8VgFas;F0|#&e9C(2rBm)Z2U=&CL=^zU5f*g<wCV+fU2#P=n2m%B`APfXh
+z2Bw1PU>2AI=79xZAy^ESf)$_wRDvq77OV#w!Dg@(>;OB#F7PY(4eSN`!9h?5j)LRh
+zB&Y{xz&Y?cxCE|%>)<B11 at 3@*-~o69n!r==4|oAyfj8h?a<k+X$sZ-RNp7FqA-Pj>
+z at 8o`@g|w1((m}dOob-_ak|a||h8#_%lbK{TIi8$A=97hF5jlk{B at r1SIZ`0Y$Z6yZ
+zauzv<oJTGo7m`cJ<zzWoK~|Eh$u;CUawEB!+(K?AcapovU&$J>mfS}kB<si{<T3ID
+zd5Wwj&yeTIi{xeUDtVp!gZz_hB=3_C$;ag1<UiyK@)h|X`HuWRHK$rqt*ACsd#WSV
+znd(OMr20 at X)BtKQ6-y1J;;1jE5!BaIJSC=Nl!C%2EoGq0l$A=PoRphNqP&!!0u)Kn
+zR4SE5rBj(yHkCu=Q4^^GYBDv23Q~w-DUK4TZ>jI7nbd4*E;XN8NG+k3Q{~i3YBjZn
+z`ia^=ZKk$TJE-5NeJPJpno^#oJWqL<@+RdS-HdKYx2D_C9q7(<H at YX?hmN5K(nIK>
+zbR7K!J%S!di)k6Hq}8;JHqsW_MmuOXjnh6lKqu2FbSj-jXV6)64xLBm(}i>~T}mUG
+zrFpuHo<`50XVY`(1 at t0%DZPTOpjXjr=ymi)x|-fb|4i?q_t3TUe)<r7gg#E6q8sRQ
+z^ac7deT}|J-=^=<_vuG;6aAEaPQRqz(C?ULOiQLU(~jxDbY{9SJ()gC3^R}!!VG2N
+zm at k+S%t%Je$QUJ~W^{~^u`o8q!MGWm at iBm*7={_mq%)b!I3|~w$V_62m=XpuA%<fj
+z%v5GNGmDwS%x4xdOPJ-%k4z;~#q4GpnAfSc)U&BCN5zgBKkDYF*P~mHHjk!87maR8
+z%Sl6N^U})G_M{yiLysvOb3c7Rx- at -R`tJ0)jP at C_jJ%A}jCmQ=89Ou1WPBJKH#T)F
+zJGMNtZKgYu%AA-9Gv{TNXYR^;ocSSZVAkxcrCHmvZfCd5wr8hhXJ at n7FUEBq2gZ$$
+z3XHdNVshr^Y|ptko*O at H{JQa%#y946%N>?$&mEszlKVsM%G_Of&b<7*IeEwOu1%Oe
+zVRh8bES|_uoIP>d#0U8)`J3~9FBn*0EtpwQS+J*|zM!$-!=!$b43knPZJ*Rom|9p=
+z7%40-JW+UKa>vOdCm)}Dd-A)YHbn!A<VE$xpB0ZPE-elh&nRA8ys`NBl(H$yr~EYK
+z*pxRVMJ3BhZkF6Hc~tUO$-gD9N?w<?C~Xzo72Ff74ekpb3?2?14W0;|4mJeO1uq0I
+z1+NBg1aAfJ1RH}7f{%iagHM9bg3p65gRg`C1>eKy5C^t~?cm3-BkT;j!Je=;><eSy
+z05}-N!eKBDegVIPU%_}NfikFs7}P=oG(iirK?iifB<O_!NWv7D3e#W)%!Ju62j;<i
+zSO|+ at 34|~N!%%=_a2lKrXTsTVE}Rd4fQ#WWSPm;-C0q^H!u4<?tcKg*&+r$x8`i*D
+zxE~&Zhv6}J5}t+)@Ep7VFTtzu2D}CDz(#l<K7 at b4C-52k7rugT;9K|}HAf$zHmDu?
+z7<EKlP<PZ5^+7Rc02+*9(NOd$`V0+6Bhc4KgrrD;Fr-BWWI`5XMRw#sF62Q3@*#jI
+zM59!chSJekl#OywE}DoYp(0d*Ao>P{5sxBhDw>XFqS<IJnvZ@!i_j9Z9Q}w^qE%=O
+zT8B2E&1fsyj&`Ems0Qst2hbsO7#%|=&?(e_&Y=tFGP;KDqWhs`q4Lnm(CX0I(E8A(
+z(3a5l(9Y2AP)%rW=s>70bTo7#bUJh<bUt)3bR~2>^hfB=P-Eyp=&#U|(6i9Lp;w{*
+zLhsq;>_==HwmsXC?ZS3vd$E1l{_G$&mL0}^#tvt{V&ho}D`!=#hSjqsHi5OXPS(Q`
+zte;J0Q`l5Cjm==Q*c>*G&1VbQVz!h;EX(q289R-g!OmvqvJ2Qn>{50GTfwek*Rbo@
+zjchf$js2P3#qMEi+5PMx_6U2NJ;gS#=hzGEW%e3-lfBK}W$&|(*e3QV`<#8rzG2^m
+zn}u73TZh|4VW7_8ZqX)hpKwfgV0cJ)XgDsqWEl}28QlxX!pg8Ztc!+zEn!>O5jA at 7
+zDE0%Q^CBiZI-DNP43CTEwkL)sMR}f*FpSbYTsRV)zf2F$3eO484=;?4a+XK^m&z#B
+z_EU7lvpHIj-w_S8{~9f$?~5*K4u_9LNtXKX*=U>kQuu1L{(LKZCt5^)7=?fSj!tJ@
+zgkOi>hCf8%i&k7)?qjYK*OlwR_2&9<1GvH5C)}spaPBKEo|ADHr{^qOBIn@<&d*WY
+zC~gdw!DVr|+(fQ`E9Oc$#BrR!P2*;8bGRS4rQ8axf~(}Jxb<8$w}acs?dEE at z1)88
+z5O;(-$<=dbxr^L2?iP24yT?7`o^VgO=iF=VJ>QIP$9Len@;&&ze1CorAIrz_pYvbw
+zVqV58c{Oj~&Agp=@*bYx0Z;O&d>Wt0kK-rsg?uqz$|IiRBmB4gcl=ELdwv1GgfHh;
+z@~ikNem!5!@8EyoYxr7zA795G=TGuy`1AZl{tADMzrp{(-{$Y~_xVSB6aSQd!N2C;
+z3oV7#LR;Zup_9;E=p)1kgN0$jXTk{KYaw0`3kpFa=meu+6%qxPkR*78fItegFiIFB
+zWC=M!o-j$6EKCuC0uneu5WW?@6J`jrh55o_VTDj3R0->aO~MvoyRcK(Ez}76g~P%z
+z;iPazI4 at ilZV0!8JHkETq3~FECcG5h3LhfPBdsItBAp^#BHbgsA~BJHkxwF at Muta5
+rM#K?yL>tjXY!OGq8SzJwBV=SuBrD3CMPG{+|GS;4{&)ZXj}-qOd)(0e
+
+-- 
+1.7.0.4
+

Added: trunk/dports/x11/xorg-server-devel/files/0020-XGE-don-t-register-an-extension-event.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0020-XGE-don-t-register-an-extension-event.patch	                        (rev 0)
+++ trunk/dports/x11/xorg-server-devel/files/0020-XGE-don-t-register-an-extension-event.patch	2010-04-16 00:13:29 UTC (rev 66512)
@@ -0,0 +1,79 @@
+From 9157b0ad4d016ebc7dd22dc4b50d20fd0c609044 Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau at debian.org>
+Date: Tue, 6 Apr 2010 11:51:53 +0200
+Subject: [PATCH 20/25] XGE: don't register an extension event
+
+The GenericEvent is a core event, we never send an extension event, so
+don't reserve an id for one.
+
+Signed-off-by: Julien Cristau <jcristau at debian.org>
+Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
+Signed-off-by: Keith Packard <keithp at keithp.com>
+(cherry picked from commit fc5d76740851725e3788c68e14474a012a205892)
+
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+---
+ Xext/geext.c |   13 +------------
+ Xext/geint.h |    3 ---
+ 2 files changed, 1 insertions(+), 15 deletions(-)
+
+diff --git xorg-server-1.8.0/Xext/geext.c xorg-server-1.8.0/Xext/geext.c
+index 2ba0ca8..f0a3d87 100644
+--- xorg-server-1.8.0/Xext/geext.c
++++ xorg-server-1.8.0/Xext/geext.c
+@@ -36,11 +36,8 @@
+ 
+ #define rClient(obj) (clients[CLIENT_ID((obj)->resource)])
+ 
+-int GEEventBase;
+-int GEErrorBase;
+ static int GEClientPrivateKeyIndex;
+ DevPrivateKey GEClientPrivateKey = &GEClientPrivateKeyIndex;
+-int GEEventType; /* The opcode for all GenericEvents will have. */
+ 
+ int RT_GECLIENT  = 0;
+ 
+@@ -178,10 +175,6 @@ GEResetProc(ExtensionEntry *extEntry)
+ {
+     DeleteCallback(&ClientStateCallback, GEClientCallback, 0);
+     EventSwapVector[GenericEvent] = NotImplemented;
+-
+-    GEEventBase = 0;
+-    GEErrorBase = 0;
+-    GEEventType = 0;
+ }
+ 
+ /*  Calls the registered event swap function for the extension.
+@@ -225,14 +218,10 @@ GEExtensionInit(void)
+     }
+ 
+     if((extEntry = AddExtension(GE_NAME,
+-                        GENumberEvents, GENumberErrors,
++                        0, GENumberErrors,
+                         ProcGEDispatch, SProcGEDispatch,
+                         GEResetProc, StandardMinorOpcode)) != 0)
+     {
+-        GEEventBase = extEntry->eventBase;
+-        GEErrorBase = extEntry->errorBase;
+-        GEEventType = GEEventBase;
+-
+         memset(GEExtensions, 0, sizeof(GEExtensions));
+ 
+         EventSwapVector[GenericEvent] = (EventSwapPtr) SGEGenericEvent;
+diff --git xorg-server-1.8.0/Xext/geint.h xorg-server-1.8.0/Xext/geint.h
+index 881d306..10a33ce 100644
+--- xorg-server-1.8.0/Xext/geint.h
++++ xorg-server-1.8.0/Xext/geint.h
+@@ -37,9 +37,6 @@
+ #include "extnsionst.h"
+ #include <X11/extensions/geproto.h>
+ 
+-extern _X_EXPORT int GEEventType;
+-extern _X_EXPORT int GEEventBase;
+-extern _X_EXPORT int GEErrorBase;
+ extern _X_EXPORT DevPrivateKey GEClientPrivateKey;
+ 
+ typedef struct _GEClientInfo {
+-- 
+1.7.0.4
+

Added: trunk/dports/x11/xorg-server-devel/files/0021-xfree86-Fix-priority-ordering-for-ignoring-input-cla.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0021-xfree86-Fix-priority-ordering-for-ignoring-input-cla.patch	                        (rev 0)
+++ trunk/dports/x11/xorg-server-devel/files/0021-xfree86-Fix-priority-ordering-for-ignoring-input-cla.patch	2010-04-16 00:13:29 UTC (rev 66512)
@@ -0,0 +1,63 @@
+From d0e9583fa803a219bb993dc81c6f2abc83e65e81 Mon Sep 17 00:00:00 2001
+From: Dan Nicholson <dbn.lists at gmail.com>
+Date: Tue, 16 Feb 2010 08:11:41 -0800
+Subject: [PATCH 21/25] xfree86: Fix priority ordering for ignoring input classes
+
+Commit 8736d112afb0dd61dfdaadd6378eafd200b2ef5f changed the priority
+ordering of the InputClass option merging to be "last match wins". This
+fixes the handling of Option "Ignore" to follow that logic.
+
+Signed-off-by: Dan Nicholson <dbn.lists at gmail.com>
+Reviewed-by: Keith Packard <keithp at keithp.com>
+(cherry picked from commit adbbc661080ba4efdb764c154d40c4d2fe718e16)
+
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+---
+ hw/xfree86/common/xf86Xinput.c |   19 ++++++++++++-------
+ 1 files changed, 12 insertions(+), 7 deletions(-)
+
+diff --git xorg-server-1.8.0/hw/xfree86/common/xf86Xinput.c xorg-server-1.8.0/hw/xfree86/common/xf86Xinput.c
+index 8229227..7723ba6 100644
+--- xorg-server-1.8.0/hw/xfree86/common/xf86Xinput.c
++++ xorg-server-1.8.0/hw/xfree86/common/xf86Xinput.c
+@@ -625,25 +625,30 @@ MergeInputClasses(IDevPtr idev, InputAttributes *attrs)
+     return Success;
+ }
+ 
++/*
++ * Iterate the list of classes and look for Option "Ignore". Return the
++ * value of the last matching class and holler when returning TRUE.
++ */
+ static Bool
+ IgnoreInputClass(IDevPtr idev, InputAttributes *attrs)
+ {
+     XF86ConfInputClassPtr cl;
+-    Bool ignore;
++    Bool ignore = FALSE;
++    const char *ignore_class;
+ 
+     for (cl = xf86configptr->conf_inputclass_lst; cl; cl = cl->list.next) {
+         if (!InputClassMatches(cl, attrs))
+             continue;
+         if (xf86findOption(cl->option_lst, "Ignore")) {
+             ignore = xf86CheckBoolOption(cl->option_lst, "Ignore", FALSE);
+-            if (ignore)
+-                xf86Msg(X_CONFIG,
+-                        "%s: Ignoring device from InputClass \"%s\"\n",
+-                        idev->identifier, cl->identifier);
+-            return ignore;
++            ignore_class = cl->identifier;
+         }
+     }
+-    return FALSE;
++
++    if (ignore)
++        xf86Msg(X_CONFIG, "%s: Ignoring device from InputClass \"%s\"\n",
++                idev->identifier, ignore_class);
++    return ignore;
+ }
+ 
+ /**
+-- 
+1.7.0.4
+

Added: trunk/dports/x11/xorg-server-devel/files/0023-XQuartz-Fix-possible-NULL-dereference-in-ListenOnOpe.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0023-XQuartz-Fix-possible-NULL-dereference-in-ListenOnOpe.patch	                        (rev 0)
+++ trunk/dports/x11/xorg-server-devel/files/0023-XQuartz-Fix-possible-NULL-dereference-in-ListenOnOpe.patch	2010-04-16 00:13:29 UTC (rev 66512)
@@ -0,0 +1,35 @@
+From 19ff17fce901afcc6c9be29509e28e53a5d71530 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu at apple.com>
+Date: Wed, 14 Apr 2010 09:06:04 -0700
+Subject: [PATCH 23/25] XQuartz: Fix possible NULL dereference in ListenOnOpenFD
+
+<rdar://problem/7862319>
+
+Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
+Reviewed-by: Marc Majka <majka at apple.com>
+(cherry picked from commit fe7778e58e099d353689755ed2f5aa440569ebe3)
+---
+ os/connection.c |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git xorg-server-1.8.0/os/connection.c xorg-server-1.8.0/os/connection.c
+index 3ff93bb..61ba72a 100644
+--- xorg-server-1.8.0/os/connection.c
++++ xorg-server-1.8.0/os/connection.c
+@@ -1253,10 +1253,11 @@ MakeClientGrabPervious(ClientPtr client)
+ void ListenOnOpenFD(int fd, int noxauth) {
+     char port[256];
+     XtransConnInfo ciptr;
++    const char *display_env = getenv("DISPLAY");
+ 
+-    if(!strncmp(getenv("DISPLAY"), "/tmp/launch", 11)) {
++    if(display_env && (strncmp(display_env, "/tmp/launch", 11) == 0)) {
+         /* Make the path the launchd socket if our DISPLAY is set right */
+-        strcpy(port, getenv("DISPLAY"));
++        strcpy(port, display_env);
+     } else {
+         /* Just some default so things don't break and die. */
+         sprintf(port, ":%d", atoi(display));
+-- 
+1.7.0.4
+

Added: trunk/dports/x11/xorg-server-devel/files/0024-XQuartz-GLX-Don-t-let-garbage-enter-our-pixel-reques.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0024-XQuartz-GLX-Don-t-let-garbage-enter-our-pixel-reques.patch	                        (rev 0)
+++ trunk/dports/x11/xorg-server-devel/files/0024-XQuartz-GLX-Don-t-let-garbage-enter-our-pixel-reques.patch	2010-04-16 00:13:29 UTC (rev 66512)
@@ -0,0 +1,29 @@
+From dbc093ec10a3b734f99e13d4c43f273e6d9b6a39 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu at apple.com>
+Date: Thu, 15 Apr 2010 10:55:53 -0700
+Subject: [PATCH 24/25] XQuartz GLX: Don't let garbage enter our pixel request
+
+https://bugs.freedesktop.org/show_bug.cgi?id=27654
+
+Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
+(cherry picked from commit 5b0faf355465c9f21ad96e0ed266fbdbc29efb5b)
+---
+ hw/xquartz/GL/indirect.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git xorg-server-1.8.0/hw/xquartz/GL/indirect.c xorg-server-1.8.0/hw/xquartz/GL/indirect.c
+index f2af3ff..70558ed 100644
+--- xorg-server-1.8.0/hw/xquartz/GL/indirect.c
++++ xorg-server-1.8.0/hw/xquartz/GL/indirect.c
+@@ -548,7 +548,7 @@ static CGLPixelFormatObj makeFormat(__GLXconfig *conf) {
+        attr[i++] = conf->samples;
+     }
+      
+-    attr[i + 1] = 0;
++    attr[i] = 0;
+ 
+     error = CGLChoosePixelFormat(attr, &fobj, &formats);
+     if(error) {
+-- 
+1.7.0.4
+

Added: trunk/dports/x11/xorg-server-devel/files/0025-fb-Revert-fb-changes-that-broke-XQuartz.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0025-fb-Revert-fb-changes-that-broke-XQuartz.patch	                        (rev 0)
+++ trunk/dports/x11/xorg-server-devel/files/0025-fb-Revert-fb-changes-that-broke-XQuartz.patch	2010-04-16 00:13:29 UTC (rev 66512)
@@ -0,0 +1,231 @@
+From 46c3d0b6506dd6f7e8dd3088f5a3874a89d5f687 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu at apple.com>
+Date: Fri, 12 Feb 2010 19:48:52 -0800
+Subject: [PATCH 25/25] fb: Revert fb changes that broke XQuartz
+
+http://bugs.freedesktop.org/show_bug.cgi?id=26124
+
+Revert "Fix source pictures getting random transforms after 2d6a8f668342a5190cdf43b5."
+Revert "fb: Adjust transform or composite coordinates for pixman operations"
+
+http://bugs.freedesktop.org/26124
+
+This reverts commit a72c65e9176c51de95db2fdbf4c5d946a4911695.
+This reverts commit a6bd5d2e482a5aa84acb3d4932e2a166d8670ef1.
+
+Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
+---
+ fb/fb.h     |    7 +----
+ fb/fbpict.c |   72 ++++++++++++++++++-----------------------------------------
+ fb/fbtrap.c |    6 +---
+ 3 files changed, 26 insertions(+), 59 deletions(-)
+
+diff --git xorg-server-1.8.0/fb/fb.h xorg-server-1.8.0/fb/fb.h
+index 02d6c03..ed21f9e 100644
+--- xorg-server-1.8.0/fb/fb.h
++++ xorg-server-1.8.0/fb/fb.h
+@@ -2082,11 +2082,8 @@ fbFillRegionSolid (DrawablePtr	pDrawable,
+ 		   FbBits	xor);
+ 
+ extern _X_EXPORT pixman_image_t *
+-image_from_pict (PicturePtr	pict,
+-		 Bool		has_clip,
+-		 int		*xoff,
+-		 int		*yoff);
+-
++image_from_pict (PicturePtr pict,
++		 Bool       has_clip);
+ extern _X_EXPORT void free_pixman_pict (PicturePtr, pixman_image_t *);
+ 
+ #endif /* _FB_H_ */
+diff --git xorg-server-1.8.0/fb/fbpict.c xorg-server-1.8.0/fb/fbpict.c
+index dddfce8..07a2286 100644
+--- xorg-server-1.8.0/fb/fbpict.c
++++ xorg-server-1.8.0/fb/fbpict.c
+@@ -158,24 +158,19 @@ fbComposite (CARD8      op,
+ 	     CARD16     height)
+ {
+     pixman_image_t *src, *mask, *dest;
+-    int src_xoff, src_yoff;
+-    int msk_xoff, msk_yoff;
+-    int dst_xoff, dst_yoff;
+     
+     miCompositeSourceValidate (pSrc, xSrc - xDst, ySrc - yDst, width, height);
+     if (pMask)
+ 	miCompositeSourceValidate (pMask, xMask - xDst, yMask - yDst, width, height);
+     
+-    src = image_from_pict (pSrc, FALSE, &src_xoff, &src_yoff);
+-    mask = image_from_pict (pMask, FALSE, &msk_xoff, &msk_yoff);
+-    dest = image_from_pict (pDst, TRUE, &dst_xoff, &dst_yoff);
++    src = image_from_pict (pSrc, TRUE);
++    mask = image_from_pict (pMask, TRUE);
++    dest = image_from_pict (pDst, TRUE);
+ 
+     if (src && dest && !(pMask && !mask))
+     {
+ 	pixman_image_composite (op, src, mask, dest,
+-				xSrc + src_xoff, ySrc + src_yoff,
+-				xMask + msk_xoff, yMask + msk_yoff,
+-				xDst + dst_xoff, yDst + dst_yoff,
++				xSrc, ySrc, xMask, yMask, xDst, yDst,
+ 				width, height);
+     }
+ 
+@@ -275,22 +270,22 @@ create_conical_gradient_image (PictGradient *gradient)
+ 
+ static pixman_image_t *
+ create_bits_picture (PicturePtr pict,
+-		     Bool       has_clip,
+-		     int	*xoff,
+-		     int	*yoff)
++		     Bool       has_clip)
+ {
+-    PixmapPtr pixmap;
+     FbBits *bits;
+     FbStride stride;
+-    int bpp;
++    int bpp, xoff, yoff;
+     pixman_image_t *image;
+     
+-    fbGetDrawablePixmap (pict->pDrawable, pixmap, *xoff, *yoff);
+-    fbGetPixmapBitsData(pixmap, bits, stride, bpp);
++    fbGetDrawable (pict->pDrawable, bits, stride, bpp, xoff, yoff);
++
++    bits = (FbBits*)((CARD8*)bits +
++		     (pict->pDrawable->y + yoff) * stride * sizeof(FbBits) +
++		     (pict->pDrawable->x + xoff) * (bpp / 8));
+ 
+     image = pixman_image_create_bits (
+ 	pict->format,
+-	pixmap->drawable.width, pixmap->drawable.height,
++	pict->pDrawable->width, pict->pDrawable->height,
+ 	(uint32_t *)bits, stride * sizeof (FbStride));
+     
+     
+@@ -316,52 +311,30 @@ create_bits_picture (PicturePtr pict,
+ 	if (pict->clientClipType != CT_NONE)
+ 	    pixman_image_set_has_client_clip (image, TRUE);
+ 
+-	if (*xoff || *yoff)
+-	    pixman_region_translate (pict->pCompositeClip, *xoff, *yoff);
++	pixman_region_translate (pict->pCompositeClip, - pict->pDrawable->x, - pict->pDrawable->y);
+ 
+ 	pixman_image_set_clip_region (image, pict->pCompositeClip);
+ 
+-	if (*xoff || *yoff)
+-	    pixman_region_translate (pict->pCompositeClip, -*xoff, -*yoff);
++	pixman_region_translate (pict->pCompositeClip, pict->pDrawable->x, pict->pDrawable->y);
+     }
+     
+     /* Indexed table */
+     if (pict->pFormat->index.devPrivate)
+ 	pixman_image_set_indexed (image, pict->pFormat->index.devPrivate);
+ 
+-    /* Add in drawable origin to position within the image */
+-    *xoff += pict->pDrawable->x;
+-    *yoff += pict->pDrawable->y;
+-
+     return image;
+ }
+ 
+ static void
+-set_image_properties (pixman_image_t *image, PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
++set_image_properties (pixman_image_t *image, PicturePtr pict)
+ {
+     pixman_repeat_t repeat;
+     pixman_filter_t filter;
+     
+     if (pict->transform)
+     {
+-	/* For source images, adjust the transform to account
+-	 * for the drawable offset within the pixman image,
+-	 * then set the offset to 0 as it will be used
+-	 * to compute positions within the transformed image.
+-	 */
+-	if (!has_clip) {
+-	    struct pixman_transform	adjusted;
+-
+-	    adjusted = *pict->transform;
+-	    pixman_transform_translate(&adjusted,
+-				       NULL,
+-				       pixman_int_to_fixed(*xoff),
+-				       pixman_int_to_fixed(*yoff));
+-	    pixman_image_set_transform (image, &adjusted);
+-	    *xoff = 0;
+-	    *yoff = 0;
+-	} else
+-	    pixman_image_set_transform (image, pict->transform);
++	pixman_image_set_transform (
++	    image, (pixman_transform_t *)pict->transform);
+     }
+     
+     switch (pict->repeatType)
+@@ -388,8 +361,7 @@ set_image_properties (pixman_image_t *image, PicturePtr pict, Bool has_clip, int
+     
+     if (pict->alphaMap)
+     {
+-	int alpha_xoff, alpha_yoff;
+-	pixman_image_t *alpha_map = image_from_pict (pict->alphaMap, FALSE, &alpha_xoff, &alpha_yoff);
++	pixman_image_t *alpha_map = image_from_pict (pict->alphaMap, TRUE);
+ 	
+ 	pixman_image_set_alpha_map (
+ 	    image, alpha_map, pict->alphaOrigin.x, pict->alphaOrigin.y);
+@@ -422,7 +394,8 @@ set_image_properties (pixman_image_t *image, PicturePtr pict, Bool has_clip, int
+ }
+ 
+ pixman_image_t *
+-image_from_pict (PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
++image_from_pict (PicturePtr pict,
++		 Bool has_clip)
+ {
+     pixman_image_t *image = NULL;
+ 
+@@ -431,7 +404,7 @@ image_from_pict (PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
+ 
+     if (pict->pDrawable)
+     {
+-	image = create_bits_picture (pict, has_clip, xoff, yoff);
++	image = create_bits_picture (pict, has_clip);
+     }
+     else if (pict->pSourcePict)
+     {
+@@ -452,11 +425,10 @@ image_from_pict (PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
+ 	    else if (sp->type == SourcePictTypeConical)
+ 		image = create_conical_gradient_image (gradient);
+ 	}
+-	*xoff = *yoff = 0;
+     }
+     
+     if (image)
+-	set_image_properties (image, pict, has_clip, xoff, yoff);
++	set_image_properties (image, pict);
+     
+     return image;
+ }
+diff --git xorg-server-1.8.0/fb/fbtrap.c xorg-server-1.8.0/fb/fbtrap.c
+index 515e2e1..830603a 100644
+--- xorg-server-1.8.0/fb/fbtrap.c
++++ xorg-server-1.8.0/fb/fbtrap.c
+@@ -40,8 +40,7 @@ fbAddTraps (PicturePtr	pPicture,
+ 	    int		ntrap,
+ 	    xTrap	*traps)
+ {
+-    int image_xoff, image_yoff;
+-    pixman_image_t *image = image_from_pict (pPicture, FALSE, &image_xoff, &image_yoff);
++    pixman_image_t *image = image_from_pict (pPicture, FALSE);
+ 
+     if (!image)
+ 	return;
+@@ -57,8 +56,7 @@ fbRasterizeTrapezoid (PicturePtr    pPicture,
+ 		      int	    x_off,
+ 		      int	    y_off)
+ {
+-    int	mask_xoff, mask_yoff;
+-    pixman_image_t *image = image_from_pict (pPicture, FALSE, &mask_xoff, &mask_yoff);
++    pixman_image_t *image = image_from_pict (pPicture, FALSE);
+ 
+     if (!image)
+ 	return;
+-- 
+1.7.0.4
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100415/b12cbc75/attachment-0001.html>


More information about the macports-changes mailing list