Merge remote-tracking branch 'origin/tizen' into da-file 92/27492/1
authorhyeran74.kim <hyeran74.kim@samsung.com>
Mon, 15 Sep 2014 00:26:41 +0000 (09:26 +0900)
committerhyeran74.kim <hyeran74.kim@samsung.com>
Mon, 15 Sep 2014 00:27:13 +0000 (09:27 +0900)
Change-Id: I618894d40ae97cfcb0f831fe7834921867ef6fd2
Signed-off-by: hyeran74.kim <hyeran74.kim@samsung.com>

Trivial merge