Merging from trunk

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