Index: IPAddressConverter.cs
===================================================================
--- IPAddressConverter.cs	(revision 468656)
+++ IPAddressConverter.cs	(working copy)
@@ -77,8 +77,12 @@
 				try
 				{
 #if NET_2_0
+					// Try to parse the string as an IP address.
+					IPAddress addr;
+					if (IPAddress.TryParse(str, out addr))
+						return addr;
+
 					// Try to resolve via DNS. This is a blocking call. 
-					// GetHostEntry works with either an IPAddress string or a host name
 					IPHostEntry host = Dns.GetHostEntry(str);
 					if (host != null && 
 						host.AddressList != null &&