Merge remote-tracking branch 'suse/opensuse-1.6' into suse

Conflicts:
	linux-user/ioctls.h
	linux-user/ioctls_alsa.h
	linux-user/ioctls_alsa_structs.h
	linux-user/syscall.c
	linux-user/syscall_types.h
	linux-user/syscall_types_alsa.h
	thunk.c