From: Seungyoun Ju <sy39.ju@samsung.com>
Date: Tue, 9 Apr 2013 10:48:09 +0000 (+0900)
Subject: Merge branch 'master' into tizen_2.1
X-Git-Tag: 2.1b_release~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8ccefde913f9d2f4f96c2f09c599d994cf8847b4;p=platform%2Fcore%2Fapi%2Ftethering.git

Merge branch 'master' into tizen_2.1

Conflicts:
	CMakeLists.txt
	include/marshal.list
	include/tethering.h
	include/tethering.xml
	include/tethering_private.h
	packaging/capi-network-tethering.spec
	src/tethering.c
	src/tethering_client.c

Change-Id: If2ba3a5650b604fc9f676dffc9d0961917fcaf36
---

8ccefde913f9d2f4f96c2f09c599d994cf8847b4