Merge branch 'master' of https://code.google.com/p/soc