Sync with main sources.

These syncs have been missed on the past somehow.


git-svn-id: http://sctp-refimpl.googlecode.com/svn/trunk@8459 9df1edf5-d72c-5b5f-11c0-5f5209eb73f7
9 files changed