Notes added by 'git notes edit'
Merged notes from refs/notes/suse/upstreaming into refs/notes/upstreaming

Conflicts:
	ec4d367e2eb89f736c5db2e796fc554084e94a9b