Merging from trunk

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