Getting it to compile#38

linux-colonel wants to merge 4 commits intoromkey:masterromkey/vendo:masterfrom

linux-colonel:masterlinux-colonel/vendo:masterCopy head branch name to clipboard