merge in gingerbread-release history after reset to gingerbread
tree: 865464e47c5ed77780533603ed957014f2dccdd5
  1. core/
  2. services/