[parrot/parrot] 557e85: Fix conflicts in merge. Untested

[noreply at github.com]

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

Commit: 557e85c1fa1596d555855118f00f460c2e586511
    https://github.com/parrot/parrot/commit/557e85c1fa1596d555855118f00f460c2e586511
Author: Whiteknight <wknight8111 at gmail.com>
Date:   2010-12-01 (Wed, 01 Dec 2010)

Changed paths:
  M MANIFEST
  M compilers/imcc/main.c
  M config/auto/ipv6/test.in
  M config/gen/makefiles/root.in
  M examples/c/test_main.c
  A examples/embed/embedded_pir.c
  A examples/embed/hello_world.pir
  A include/parrot/api.h
  M include/parrot/embed.h
  M include/parrot/gc_api.h
  M include/parrot/global_setup.h
  M include/parrot/imcc.h
  M include/parrot/interpreter.h
  M include/parrot/library.h
  M include/parrot/longopt.h
  M include/parrot/parrot.h
  M src/embed.c
  A src/embed/api.c
  A src/embed/embed_private.h
  A src/embed/pmc.c
  A src/embed/strings.c
  M src/exceptions.c
  M src/exit.c
  M src/gc/api.c
  M src/gc/gc_private.h
  M src/global_setup.c
  M src/library.c
  M src/longopt.c
  M src/main.c
  M src/ops/core_ops.c
  M src/parrot_debugger.c
  M src/pbc_disassemble.c
  M src/pbc_dump.c
  M src/pbc_merge.c
  M t/pmc/string.t
  M tools/build/parrot_config_c.pl
  M tools/dev/pbc_to_exe.pir

Log Message:
-----------
Fix conflicts in merge. Untested