[parrot/parrot] fc2545: resolve api.yaml conflict after merge from master

[noreply at github.com]

  Branch: refs/heads/whiteknight/packfilewrapper
  Home:   https://github.com/parrot/parrot

  Commit: fc2545569b9a46820d13fb38a98f0032c1b8be6c
      https://github.com/parrot/parrot/commit/fc2545569b9a46820d13fb38a98f0032c1b8be6c
  Author: Whiteknight <wknight8111 at gmail.com>
  Date:   2011-07-07 (Thu, 07 Jul 2011)

  Changed paths:
    M MANIFEST
  M NEWS
  M api.yaml
  M compilers/pct/src/PAST/Compiler.pir
  M compilers/pct/src/PAST/Node.pir
  M config/auto/warnings.pm
  M config/gen/makefiles/root.in
  M docs/embed.pod
  M docs/pdds/pdd17_pmc.pod
  M docs/pdds/pdd28_strings.pod
  M ext/winxed/compiler.pir
  M frontend/parrot/main.c
  M include/parrot/hash.h
  M lib/Parrot/Config.pm
  M lib/Parrot/Pmc2c/PMC.pm
  M runtime/parrot/library/Digest/sha256.pir
  M runtime/parrot/library/Test/More.pir
  M runtime/parrot/library/distutils.pir
  M src/call/args.c
  M src/gc/fixed_allocator.c
  M src/gc/gc_gms.c
  M src/gc/gc_ms2.c
  M src/hash.c
  M src/oo.c
  M src/ops/core_ops.c
  M src/ops/string.ops
  M src/packfile/pf_items.c
  M src/pmc.c
  M src/pmc/hash.pmc
  M src/pmc/lexinfo.pmc
  M src/pmc/namespace.pmc
  M src/pmc/scalar.pmc
  M src/pmc/string.pmc
  M src/pmc/stringbuilder.pmc
  M src/runcore/cores.c
  M src/string/api.c
  M src/vtable.tbl
  M src/warnings.c
  M t/library/pg.t
  M t/pmc/io_iterator.t
  M t/src/embed.t
  M t/src/extend_vtable.t
  R tools/dev/dedeprecator
  A tools/dev/dedeprecator.nqp
  M tools/dev/fetch_languages.pl
  M tools/dev/vtablize.pl

  Log Message:
  -----------
  resolve api.yaml conflict after merge from master