Save state before 1.36 merges.

svn path=/branches/pdimov_pre_136/libs/functional/test/; revision=47337