pallet/pallet — pull request #156 by hugoduncan (2012-08-18 15:58:38+00:00)
Title: Fix merging of environment phases in bootstrap

This fixes the merging of the environment phases in boostrap, without
breaking the merging of other phases. Fixes #144.