Merge branch 'gingerbread' into gingerbread-release