[parrot/parrot] 713860: fix merge, it looks like just some param decoratio...

[noreply at github.com]

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

Commit: 713860fa48c7a553d78761934b3856d9a4505fb9
    https://github.com/parrot/parrot/commit/713860fa48c7a553d78761934b3856d9a4505fb9
Author: Whiteknight <wknight8111 at gmail.com>
Date:   2011-03-16 (Wed, 16 Mar 2011)

Changed paths:
  M CREDITS
  M ChangeLog
  M MANIFEST.generated
  M README
  M VERSION
  M config/gen/makefiles/root.in
  M docs/parrotbyte.pod
  M docs/parrothist.pod
  M docs/project/release_manager_guide.pod
  M docs/translations/README.BGR
  M docs/translations/README.deutsch
  M include/parrot/api.h
  M include/parrot/interpreter.h
  M include/parrot/oplib/core_ops.h
  M include/parrot/packfile.h
  M runtime/parrot/library/Archive/Tar.pir
  M runtime/parrot/library/TAP/Harness.pir
  M src/embed/pmc.c
  M src/embed/strings.c
  M src/gc/gc_ms.c
  M src/ops/core_ops.c
  M src/pmc/socket.pmc
  M t/src/extend_vtable.t
  M tools/release/release.json

Log Message:
-----------
fix merge, it looks like just some param decorations. Go with whatever master uses