[parrot/parrot] 237f12: Merge remote branch 'origin/m0-prototype' into m0-...

[noreply at github.com]

Branch: refs/heads/m0-prototype
Home:   https://github.com/parrot/parrot

Commit: 237f12a9b46e14a7c4a4f4856a72bdea720bc032
    https://github.com/parrot/parrot/commit/237f12a9b46e14a7c4a4f4856a72bdea720bc032
Author: Jonathan "Duke" Leto <jonathan at leto.net>
Date:   2011-05-06 (Fri, 06 May 2011)

Changed paths:
  M src/m0/m0_assembler.pl
  A src/m0/m0_interp.pl
  M t/m0/hello_invalid.m0
  A t/m0/hello_invalid2.m0
  M t/m0/m0_assembler.t
  A t/m0/m0_interp.t
  M t/m0/m0bgen.t
  A t/m0/test_file.m0b

Log Message:
-----------
Merge remote branch 'origin/m0-prototype' into m0-prototype

Conflicts:
	src/m0/m0_assembler.pl