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