Merging from trunk

svn path=/branches/release/libs/lambda/; revision=84745