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