merge of '2cb50c2864d750f33039bdbaeb6c15d2bd636ce4'

     and 'cb2fbb74aa4412375fdbc546fe2218ca1704cd7d'

router/java/src/org/cybergarage/xml/Node.java

@@ -284,11 +284,16 @@ public class Node
 	////////////////////////////////////////////////
 	//	equals
 	////////////////////////////////////////////////
-	
-	public boolean equals(Node otherNode) {
-		if (otherNode == null)
+	@Override
+	public boolean equals(Object o) {
+	    if (this == o)
+	        return true;
+		if (o == null)
+			return false;
+		if (!(o instanceof Node))
 			return false;
 
+		Node otherNode = (Node) o;
 		String thisNodeString = toString();
 		String otherNodeString = otherNode.toString();