Updating oversim 20121206
Merge branch 'vendor_20121206' into blind-search

Conflicts:
	src/overlay/pastry/PastryLeafSet.cc
	src/overlay/pastry/PastryLeafSet.h
	src/overlay/pastry/PastryMessage.msg
	src/overlay/pastry/PastryRoutingTable.cc