Merge pull request #1 from GalaxyTab2/4.3.1

Merge the two banches