am 9345b458: Merge "Add notes about building on Ubuntu 12.04"

* commit '9345b4588e8a70d31aab1d4639a69147f12d2169':
  Add notes about building on Ubuntu 12.04