Merging from trunk

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