That damn @SimonVT...
Merge branch 'dev' of github.com:JakeWharton/ActionBarSherlock into dev