added k3b patches / fix up samba conflicts / devil relbump