Upstream 20130302 rev 3622
Merge branch 'upstream'

Conflicts:
	Preferences.cpp
	networktables2/AbstractNetworkTableEntryStore.cpp