Merge remote-tracking branch 'origin/tizen' into da-opengl 80/25080/1
authorHyunjong.park <phjwithyou.park@samsung.com>
Tue, 29 Jul 2014 03:05:54 +0000 (12:05 +0900)
committerHyunjong.park <phjwithyou.park@samsung.com>
Tue, 29 Jul 2014 03:09:42 +0000 (12:09 +0900)
Change-Id: Ie28d29b4966bef79d1e619a5e72013ecd210b19a
Signed-off-by: Hyunjong.park <phjwithyou.park@samsung.com>

Trivial merge