22    Fix iperf to work with -B -P (updated 2.0.5)    None    open        2012-01-29  2012-01-29  5

	modified:   src/SocketAddr.c
Merge branch '22'

Conflicts:
	src/SocketAddr.c
25    IPv6 traffic class support  None    open        2012-10-02  2012-10-02  5

	modified:   src/PerfSocket.cpp