[opensuse] ms/novell merge? (again?)