Save state before 1.36 merges.

svn path=/branches/pdimov_pre_136/LICENSE_1_0.txt; revision=47337