Updating oversim 20121206
Merge branch 'vendor_20121206' into epichord

Conflicts:
	src/common/IterativeLookup.cc