Backward compatibility for Frodo (API level 8)
Merge branch '232-froyo'