PR #2708 from jreback/dtypes (as of 2013-02-08 01:26)
ENH: Optimize take_*, _merge_blocks; improve non-NA fill_value support

Conflicts:

	pandas/core/common.py
	pandas/core/internals.py
	pandas/src/generate_code.py
	pandas/src/generated.pyx