Changes approved via private email from Marek Habersack <mhabersack@novell.com> on...