Changes to be committed:
	modified:   memory.c