Merge branch 'internal' into tizen_2.2 tizen_2.2 2.2.1_release
authorsungmin ha <sungmin82.ha@samsung.com>
Fri, 25 Oct 2013 05:34:03 +0000 (14:34 +0900)
committersungmin ha <sungmin82.ha@samsung.com>
Fri, 25 Oct 2013 05:35:47 +0000 (14:35 +0900)
Change-Id: Iaf5a9bb14b6bbd7d9073789098e314828bbf0d4b
Signed-off-by: sungmin ha <sungmin82.ha@samsung.com>

Trivial merge