copied from revision 3131 of trunk/home/marki/gluex/fitter
svn merge -r 3135:3138 $HDSVN/branches/home/marki/gluex/fitter-bfield
  on to $HDSVN/trunk/home/marki/gluex/fitter