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

* commit 'e943beade36c84b0ffab3025b6338cb540e3a673':