Merge branch 'master' into tizen_2.1
authorSeungyoun Ju <sy39.ju@samsung.com>
Tue, 9 Apr 2013 10:48:09 +0000 (19:48 +0900)
committerSeungyoun Ju <sy39.ju@samsung.com>
Tue, 9 Apr 2013 10:48:13 +0000 (19:48 +0900)
commit8ccefde913f9d2f4f96c2f09c599d994cf8847b4
tree16048b8344588d53fe182e9e9230897881a12076
parentc087a5814a6519b56fdac0d4c678ff620b63cfd8
parent62567b9c6ea00bd41773e134ab7d444a94104b36
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