[parrot/parrot] ce51d7: Fix conflict in merge from master

[noreply at github.com]

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

  Commit: ce51d7f5fb9a11a86ab5fbfc91fd7818190bbca2
      https://github.com/parrot/parrot/commit/ce51d7f5fb9a11a86ab5fbfc91fd7818190bbca2
  Author: Whiteknight <wknight8111 at gmail.com>
  Date:   2011-08-03 (Wed, 03 Aug 2011)

  Changed paths:
    M MANIFEST
  M docs/dev/profiling.pod
  M docs/running.pod
  M examples/pasm/fact.pasm
  M frontend/parrot/main.c
  M lib/Parrot/Docs/Section/Tools.pm
  M runtime/parrot/library/distutils.pir
  M runtime/parrot/library/osutils.pir
  M src/dynext.c
  M src/gc/fixed_allocator.c
  M src/packfile/api.c
  M src/pmc/resizablepmcarray.pmc
  M t/examples/pasm.t
  R tools/dev/nm.pl
  R tools/dev/parrot_api.pl

  Log Message:
  -----------
  Fix conflict in merge from master