Merged revisions 328992 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/2.0

................
  r328992 | twilson | 2011-07-20 15:18:25 -0500 (Wed, 20 Jul 2011) | 12 lines
  
  Merged revisions 328987 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r328987 | twilson | 2011-07-20 15:16:58 -0500 (Wed, 20 Jul 2011) | 5 lines
    
    We can't guarantee an eth0 is present
    
    FreeBSD test fails on this case presumably because there is no eth0 on the test
    machine. Better to just remove this test for now.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@328996 65c4cc65-6c06-0410-ace0-fbb531ad65f3

tests/test_netsock2.c

@@ -69,7 +69,6 @@ AST_TEST_DEFINE(parsing)
 		{ "[2001::1]", 1 },
 		{ "[2001:0000:4136:e378:8000:63bf:3fff:fdd2]:5060", 1 },
 		{ "2001:0000:4136:e378:8000:63bf:3fff:fdd2:5060", 0 }, /* port, but no brackets */
-		{ "[fe80::200:5aee:feaa:20a2%eth0]", 1 }, /* link-local with scope id */
 		{ "[fe80::200::abcd", 0 }, /* multiple zero expansions */
 	};