Upstream 20130207 rev 3615
Merge branch 'upstream' (20130207 rev 3615)

Conflicts:
	networktables2/stream/SocketStreamFactory.cpp