Fixed conflicting edits to ppa/Makefile due to cherry-pick.
Attach a file by drag & drop or click to upload
