Merge branch 'master' of git://gitorious.org/xcf-pixbuf-loader/mainline