add support galaxy s b
major update from latest android
Merge remote-tracking branch 'cmx/gingerbread' into gingerbread

Conflicts:
	default.xml
Merge remote-tracking branch 'cmx/gingerbread' into gingerbread