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