Converted tabs to 4 spaces
Merge remote branch 'upstream/master'

Conflicts:
	src/ee/anticache/BerkeleyAntiCacheDB.cpp