merged with revision stable 0.15 of http://protobuf-c.googlecode.com/svn/trunk