[parrot/parrot] 8e8aa7: merge in from master. Fix small whitespace conflic...

[noreply at github.com]

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

  Commit: 8e8aa758310b9d41cdcaa9a5978f27dc4dec1114
      https://github.com/parrot/parrot/commit/8e8aa758310b9d41cdcaa9a5978f27dc4dec1114
  Author: Whiteknight <wknight8111 at gmail.com>
  Date:   2011-09-21 (Wed, 21 Sep 2011)

  Changed paths:
    M .gitignore
  M MANIFEST
  M MANIFEST.SKIP
  M compilers/imcc/main.c
  M compilers/imcc/pbc.c
  M compilers/opsc/src/Ops/File.pm
  M compilers/opsc/src/builtins.pir
  M config/gen/makefiles/root.in
  M ext/winxed/compiler.pir
  M ext/winxed/driver.pir
  M frontend/parrot2/prt0.pir
  M frontend/parrot2/prt0.winxed
  M include/parrot/call.h
  M include/parrot/interpreter.h
  M include/parrot/packfile.h
  M include/parrot/scheduler.h
  M include/parrot/scheduler_private.h
  M lib/Parrot/Pmc2c/PMC.pm
  M lib/Pod/Simple.pm
  A lib/Pod/Simple.pod
  M lib/Pod/Simple/BlackBox.pm
  M lib/Pod/Simple/Checker.pm
  M lib/Pod/Simple/Debug.pm
  M lib/Pod/Simple/DumpAsText.pm
  M lib/Pod/Simple/DumpAsXML.pm
  M lib/Pod/Simple/HTML.pm
  M lib/Pod/Simple/HTMLBatch.pm
  M lib/Pod/Simple/LinkSection.pm
  M lib/Pod/Simple/Methody.pm
  M lib/Pod/Simple/Progress.pm
  M lib/Pod/Simple/PullParser.pm
  M lib/Pod/Simple/PullParserEndToken.pm
  M lib/Pod/Simple/PullParserStartToken.pm
  M lib/Pod/Simple/PullParserTextToken.pm
  M lib/Pod/Simple/PullParserToken.pm
  M lib/Pod/Simple/RTF.pm
  M lib/Pod/Simple/Search.pm
  M lib/Pod/Simple/SimpleTree.pm
  A lib/Pod/Simple/Subclassing.pod
  M lib/Pod/Simple/Text.pm
  M lib/Pod/Simple/TextContent.pm
  M lib/Pod/Simple/TiedOutFH.pm
  M lib/Pod/Simple/Transcode.pm
  M lib/Pod/Simple/TranscodeDumb.pm
  M lib/Pod/Simple/TranscodeSmart.pm
  M lib/Pod/Simple/XHTML.pm
  M lib/Pod/Simple/XMLOutStream.pm
  M src/call/args.c
  M src/call/context.c
  M src/call/pcc.c
  M src/embed.c
  M src/embed/bytecode.c
  M src/gc/fixed_allocator.c
  M src/gc/fixed_allocator.h
  M src/gc/mark_sweep.c
  M src/interp/inter_cb.c
  M src/interp/inter_create.c
  M src/packfile/api.c
  M src/pmc/callcontext.pmc
  M src/pmc/class.pmc
  M src/pmc/imccompiler.pmc
  M src/pmc/lexpad.pmc
  M src/pmc/object.pmc
  M src/pmc/packfileview.pmc
  M src/pmc/scheduler.pmc
  M src/pmc/timer.pmc
  M src/scheduler.c
  M t/README.pod
  M t/op/exceptions.t
  A t/pir/interop.t
  M t/pmc/timer.t
  R tools/dev/README
  A tools/dev/README.md
  M tools/dev/resolve_deprecated.nqp
  A tools/dev/resubmit_smolder.pl

  Log Message:
  -----------
  merge in from master. Fix small whitespace conflicts