daveb
committed
on 24 Jan 07
Fixing various merge bugs, adding new message keys