am 8fa1eb06: am e943bead: am 6ac858c6: am 30836aa9: am d379101d: Merge "Update docs to recommend Ubuntu 12.04 and OSX 10.8"

* commit '8fa1eb06f10b8ed17c047996275b8dbeddeb46e4':