Merge branch 'leopard'

diff --cc Source/AppDelegate.h
Simple merge

diff --cc Source/AppDelegate.m
Simple merge

diff --cc Source/ConnectWindowController.m
Simple merge

diff --cc Source/DebuggerConnection.h
Simple merge

diff --cc Source/DebuggerConnection.m
Simple merge

diff --cc Source/DebuggerWindowController.h
Simple merge

diff --cc Source/DebuggerWindowController.m
Simple merge

diff --cc Source/NSXMLElementAdditions.h
Simple merge

diff --cc Source/NSXMLElementAdditions.m
Simple merge

diff --cc Source/SocketWrapper.h
Simple merge

diff --cc Source/SocketWrapper.m
Simple merge