Merge branch 'master' into tizen_2.1
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Tue, 28 May 2013 05:41:57 +0000 (14:41 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Tue, 28 May 2013 05:41:57 +0000 (14:41 +0900)
commit3139a8efa9b133712f97a56c7508daa657800bf3
treec96a02641dbd86b8bf0be4751b9c72200f0f47a8
parent75dc68013f1fbc69bde021d5229a3f786a7a13f5
parent169665f652d098680f8f777dfa72a88966a62367
Merge branch 'master' into tizen_2.1

Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Conflicts:
filesystem/etc/profile.d/sensord_setting.sh
filesystem/usr/lib/systemd/system/emul-legacy-start.service
packaging/system-plugin-emulator.spec

Change-Id: I70792cc2a08c5cd6d710d007167ed37e2afa26c3
packaging/system-plugin-emulator.spec