Merge branch 'opensuse-11.1'