merge actionbarcompat to 2012-06-15 01:59:51!