[parrot/parrot] 2f0dae: Merge branch 'tt1798_ipv6', extend testcases

[noreply at github.com]

Branch: refs/heads/master
Home:   https://github.com/parrot/parrot

Commit: 2f0daea91842c625ecfa6a17e280d7361e638598
    https://github.com/parrot/parrot/commit/2f0daea91842c625ecfa6a17e280d7361e638598
Author: Michael Stapelberg <michael at stapelberg.de>
Date:   2011-01-25 (Tue, 25 Jan 2011)

Changed paths:
  M MANIFEST
  M config/gen/makefiles/root.in
  M include/parrot/platform_interface.h
  M src/io/socket_api.c
  M src/platform/generic/socket.c
  M src/pmc/sockaddr.pmc
  M src/pmc/socket.pmc
  M t/pmc/sockaddr.t
  M t/pmc/socket.t
  A t/pmc/socket_ipv6.t
  A t/pmc/testlib/test_server_ipv6.pir

Log Message:
-----------
Merge branch 'tt1798_ipv6', extend testcases

Conflicts:
	config/auto/ipv6/test.in
	include/parrot/io_unix.h
	src/io/socket_unix.c
	src/pmc/socket.pmc


Commit: 5365f8c384dba2f358cebf0ff5db94965b6085d4
    https://github.com/parrot/parrot/commit/5365f8c384dba2f358cebf0ff5db94965b6085d4
Author: Jonathan "Duke" Leto <jonathan at leto.net>
Date:   2011-01-25 (Tue, 25 Jan 2011)

Changed paths:
  M src/io/socket_api.c

Log Message:
-----------
Remove debug statement


Commit: ff4364764e2711f8ac14ba7c257e6c57e9cdba3a
    https://github.com/parrot/parrot/commit/ff4364764e2711f8ac14ba7c257e6c57e9cdba3a
Author: Jonathan "Duke" Leto <jonathan at leto.net>
Date:   2011-01-25 (Tue, 25 Jan 2011)

Changed paths:
  M MANIFEST
  M config/gen/makefiles/root.in
  M include/parrot/platform_interface.h
  M src/io/socket_api.c
  M src/platform/generic/socket.c
  M src/pmc/sockaddr.pmc
  M src/pmc/socket.pmc
  M t/pmc/sockaddr.t
  M t/pmc/socket.t
  A t/pmc/socket_ipv6.t
  A t/pmc/testlib/test_server_ipv6.pir

Log Message:
-----------
Merge branch 'mstap-master'