Merging from trunk

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