Merge changes made to SLE11 to be included in trunk