# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1270812711 -3600
# Node ID fdd049a4e551eac57c663be3218b01e976827bd5
# Parent  49b5c87d2fa0082c2ad5ee8ab35f2e6cc69d36aa# Parent  c39ad633b26d76b991627971a92e054f0e35590f
Merge 0.6->0.7

diff -r 49b5c87d2fa0 -r fdd049a4e551 net/server.lua
diff -r 49b5c87d2fa0 -r fdd049a4e551 net/server_select.lua
--- a/net/server_select.lua	Wed Apr 07 21:00:20 2010 +0100
+++ b/net/server_select.lua	Fri Apr 09 12:31:51 2010 +0100
@@ -661,7 +661,7 @@
 	if type( listeners ) ~= "table" then
 		err = "invalid listener table"
 	end
-	if not type( port ) == "number" or not ( port >= 0 and port <= 65535 ) then
+	if type( port ) ~= "number" or not ( port >= 0 and port <= 65535 ) then
 		err = "invalid port"
 	elseif _server[ port ] then
 		err = "listeners on port '" .. port .. "' already exist"