merge test
Merge branch 'master' of https://github.com/u531355/ase

Conflicts:
	lib/inode.o
changes