IMPORTANT Please Read: Merge Finished

Hi all,

I finished the merge. It's safe to commit things again. Please let me
know if you have any problems.

-bw