Merge branch 'master' into tizen_2.1 tizen_2.1 accepted/tizen/20130530.164440 accepted/tizen_2.1/20130520.093235 submit/tizen/20130529.220755 submit/tizen_2.1/20130516.133723
-rwxr-xr-x 457 CMakeLists.txt
-rw-r--r-- 10995 LICENSE.Flora
-rw-r--r-- 231 NOTICE
-rw-r--r-- 24 README
drwxr-xr-x - debian
-rw-r--r-- 67 libug-setting-wifidirect-efl.manifest
-rw-r--r-- 135 org.tizen.wifi-direct-popup.manifest
-rwxr-xr-x 1026 org.tizen.wifi-direct-popup.rule
-rw-r--r-- 135 org.tizen.wifi-direct-ugapp.manifest
-rwxr-xr-x 993 org.tizen.wifi-direct-ugapp.rule
drwxr-xr-x - packaging
drwxr-xr-x - popup-wifidirect
drwxr-xr-x - ug-wifidirect
drwxr-xr-x - ugapp-wifidirect