From: Kim Gibyoung <lastkgb.kim@samsung.com>
Date: Tue, 23 Apr 2013 16:39:20 +0000 (+0900)
Subject: Merge branch 'master' into tizen_2.1
X-Git-Tag: 2.1b_release^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=333563dc3e00cf3a8cd78161d4df5b731dedf48f;p=apps%2Fnative%2Fug-wifi-direct.git

Merge branch 'master' into tizen_2.1

Change-Id: I9eed66435404d35ccfd4d61f40072f527f1a063d
---

333563dc3e00cf3a8cd78161d4df5b731dedf48f