RIACON 101-4
Merge branch 'tux-akl101-04'

Conflicts:
	lib/n39.lbr