Merge remote-tracking branch 'origin/mw' into tizen 25/22425/1 tizen_3.0.m14.2_ivi
authoryonghwan82.jeon <yonghwan82.jeon@samsung.com>
Tue, 3 Jun 2014 09:13:28 +0000 (18:13 +0900)
committeryonghwan82.jeon <yonghwan82.jeon@samsung.com>
Tue, 3 Jun 2014 09:13:28 +0000 (18:13 +0900)
Change-Id: Idd579d65e65d3103349def290fb59c6cddb76831
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>

Trivial merge