[parrot/parrot] 4e02ea: fix some conflicts in branch merge

[noreply at github.com]

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

Commit: 4e02ead2d0459dbe1f10988df9599df8b925a629
    https://github.com/parrot/parrot/commit/4e02ead2d0459dbe1f10988df9599df8b925a629
Author: Whiteknight <wknight8111 at gmail.com>
Date:   2010-12-23 (Thu, 23 Dec 2010)

Changed paths:
  M MANIFEST
  M compilers/imcc/Rules.in
  M compilers/imcc/debug.c
  M compilers/imcc/main.c
  M config/auto/ipv6/test.in
  M config/gen/makefiles/root.in
  M docs/pdds/draft/pdd10_embedding.pod
  M examples/c/test_main.c
  M frontend/parrot/main.c
  M frontend/parrot_debugger/main.c
  M frontend/pbc_dump/main.c
  M frontend/pbc_merge/main.c
  A include/parrot/api.h
  M include/parrot/debugger.h
  M include/parrot/embed.h
  M include/parrot/exit.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 include/parrot/pmc_freeze.h
  M lib/Parrot/Headerizer.pm
  M lib/Parrot/Test/Harness.pm
  M src/debug.c
  M src/dynpmc/Defines.in
  M src/dynpmc/Rules.in
  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/gc/mark_sweep.c
  M src/global_setup.c
  M src/interp/inter_misc.c
  M src/library.c
  M src/longopt.c
  M src/ops/core_ops.c
  M src/packfile/object_serialization.c
  M src/pbc_disassemble.c
  M src/pmc/exception.pmc
  M t/op/exit.t
  M t/pmc/string.t
  A t/src/embed/pmc.t
  A t/src/embed/strings.t
  M tools/build/parrot_config_c.pl
  M tools/dev/pbc_to_exe.pir

Log Message:
-----------
fix some conflicts in branch merge


Commit: c92d3403aedacd53e8b3a2f09523d8b2eda10b04
    https://github.com/parrot/parrot/commit/c92d3403aedacd53e8b3a2f09523d8b2eda10b04
Author: Whiteknight <wknight8111 at gmail.com>
Date:   2010-12-23 (Thu, 23 Dec 2010)

Changed paths:
  M compilers/imcc/main.c
  M docs/pdds/draft/pdd10_embedding.pod
  M src/embed/pmc.c

Log Message:
-----------
fix a few codetest failures


Commit: 95a4a785ac9cac3a4435ea0cdb0603aadf3bf847
    https://github.com/parrot/parrot/commit/95a4a785ac9cac3a4435ea0cdb0603aadf3bf847
Author: Whiteknight <wknight8111 at gmail.com>
Date:   2010-12-23 (Thu, 23 Dec 2010)

Changed paths:
  M src/embed/pmc.c

Log Message:
-----------
fix more codestd problems