Merging from trunk

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