Merge branch 'tizen_linux_3.12' into tizen_linux_3.12
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Tue, 13 May 2014 02:35:05 +0000 (11:35 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Tue, 13 May 2014 02:42:58 +0000 (11:42 +0900)
Change-Id: I13bba253a3677ca51a9d15c0f3e31f57aba70270


Trivial merge