merge actionbarcompat to 2012-08-30 14:46:52!