Upstream 20140101 rev 3876
Merge branch 'upstream'

Conflicts:
	Encoder.cpp
	Gyro.h
	PPC603gnu/Makefile
	PWM.cpp
	Servo.cpp
	Vision2009/AxisCamera.cpp
	networktables/NetworkTable.cpp
	networktables2/IncomingEntryReceiver.h
	networktables2/NetworkTableEntry.h
	networktables2/WriteManager.h
	networktables2/stream/FDIOStream.cpp
	networktables2/stream/SocketServerStreamProvider.cpp