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