Updated for 1 April deadline achieved#9

gavinandresen wants to merge 2 commits into

genjix:mastergenjix/bips:masterfrom

gavinandresen:masterCopy head branch name to clipboard