Gingerbread

Change-Id: I56e9a49908d63aa5a56bbf64b1aac72b76deed5d

This should be gingerbread branch only one below is mistakenly on branch froyo