Conflicts:

	modules/genrams/xilinx/Manifest.py
	modules/genrams/xilinx/generic_dpram_sameclock.vhd
	modules/genrams/xilinx/spartan6/generic_sync_fifo.vhd