added merging functionality 97/27897/1 accepted/tizen/common/20140922.231817 submit/tizen/20140922.140612
-rw-r--r-- 18006 LICENSE
drwxr-xr-x - packaging
drwxr-xr-x - src