Upgraded protobuf to 2.5.0.
Minor fixes for C++11.