merge in honeycomb-mr2-release history after reset to honeycomb-mr2