Merge remote-tracking branch 'origin/tizen' into mw 61/29461/1
authorheeyoung <heeyoung1008.hwang@samsung.com>
Tue, 28 Oct 2014 06:42:51 +0000 (15:42 +0900)
committerheeyoung <heeyoung1008.hwang@samsung.com>
Tue, 28 Oct 2014 06:43:03 +0000 (15:43 +0900)
Change-Id: Idfe9be292535fcce7f03ec6cbd41033c31f13936
Signed-off-by: heeyoung <heeyoung1008.hwang@samsung.com>

Trivial merge