Merge Fireworks/Calo from CVS HEAD.