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