merge in gingerbread-release history after reset to gingerbread