Merge branch 'master' into tizen_2.1
authorjihye1128.kim <jihye1128.kim@samsung.com>
Thu, 18 Apr 2013 02:53:25 +0000 (11:53 +0900)
committerjihye1128.kim <jihye1128.kim@samsung.com>
Thu, 18 Apr 2013 02:53:25 +0000 (11:53 +0900)
commit276af9812b4926978ad0da6d17c0f532860ddf86
treee18020b7a109dab2bbf63dad64de17f2237f0aa9
parenta661649a5e080b354aa0e1b62e6fa592ad101842
parentcc5e516c638be6a48a76218e1c092f67e60f16f0
Merge branch 'master' into tizen_2.1

Conflicts:
include/devman_define_node_path.h
include/devman_plugin_intf.h
packaging/device-manager-plugin-maru.spec
src/device_manager_io.c
src/device_manager_plugin_maru.c