Merge pull request #1 from arsenm/master

Build should not depend on the autotools build
add files new to protobuf-2.4.1
Merge pull request #2 from nadafigment/master

changes as discussed -- some new protobuf files as of 2.4.1
Update for 2.5.0