Merge branch 'devel/tizen' into tizen 34/23734/1
authorBoram Park <boram1288.park@samsung.com>
Wed, 2 Jul 2014 08:11:58 +0000 (17:11 +0900)
committerBoram Park <boram1288.park@samsung.com>
Wed, 2 Jul 2014 08:12:04 +0000 (17:12 +0900)
Change-Id: Ia38c57d9cf2b7f2e1ca870475c5ea6cbd00699ef


Trivial merge