Merge branch 'gingerbread' of git://git.omapzoom.org/platform/development into 237