Merge branch 'master' of slp-info.sec.samsung.net:slp/pkgs/c/coregl