# HG changeset patch
# User Jens Alfke <jens@mooseyard.com>
# Date 1215971946 25200
# Node ID ffdaa33a408a9dacd0c26e6ebf2ea871249274d9
# Parent  8b883753394abf3f5c2c05a43ef5badbb1e3641b# Parent  56aed357862817e066be05474575a6abe7f260ff
Merged 1.0 final into 1.1 branch.

diff -r 8b883753394a -r ffdaa33a408a .hgtags
--- a/.hgtags	Sun Jul 13 10:42:50 2008 -0700
+++ b/.hgtags	Sun Jul 13 10:59:06 2008 -0700
@@ -1,1 +1,2 @@
 2c4bb6968927ac49809c0f8dcfdc0d1b347e079c release_1
+02224e98120993726f618bd5949a8a2277b7e1bc 1.0
diff -r 8b883753394a -r ffdaa33a408a TCP/TCPConnection.m
--- a/TCP/TCPConnection.m	Sun Jul 13 10:42:50 2008 -0700
+++ b/TCP/TCPConnection.m	Sun Jul 13 10:59:06 2008 -0700
@@ -14,7 +14,7 @@
 #import "ExceptionUtils.h"
 
 
-#if TARGET_OS_IPHONE
+#if (TARGET_OS_IPHONE && !(TARGET_OS_MAC || TARGET_OS_EMBEDDED))
 // SecureTransport.h is missing on iPhone, with its SSL constants:
 enum{
     errSSLClosedAbort 			= -9806,	/* connection closed via error */