merged from trunk

svn path=/branches/proto/v4/libs/circular_buffer/; revision=49607