rc2
Merge branch 'master' of https://github.com/cabbeer/cabbeer.github.com