sixparrot merge

[Will Coleda]

That was not intended to go to master, it'll be cleaned up shortly.

-- 
Will "Coke" Coleda

_______________________________________________
http://lists.parrot.org/mailman/listinfo/parrot-dev