Smaller...

Conflicts:
	storage/yac_lock.c
	storage/yac_storage.c