merge cvs head
FWProxyBuilderConfiguration.cc
Remove obsolete member.
Remove obsolete memeber.
Merge pull request #131 from alja/calo2

Fireworks updates -- Align Fireworks/Calo 6_2_X  to CVS HEAD