24855c09
* commit '24855c09173a6caaec7dcedd0c2d7ce15121d39b': merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)
3148557c