base

Fix broken build. (do not merge)

I -did- run it...  why did this later break on me?!?

This is integrated from the Eclair branch.