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