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:24:42 +0000 (14:24 +0900)
committersungmin ha <sungmin82.ha@samsung.com>
Fri, 25 Oct 2013 05:26:11 +0000 (14:26 +0900)
Change-Id: I2a4a83f294ced3b0c321ff2068bab0d8416cad9f
Signed-off-by: sungmin ha <sungmin82.ha@samsung.com>

Trivial merge