Merging from trunk

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