Merge "version bump for new release   (please don't merge)" into gingerbread