Merge branch 'develop' into internal_release
authorsungmin ha <sungmin82.ha@samsung.com>
Thu, 5 Jul 2012 05:06:29 +0000 (14:06 +0900)
committersungmin ha <sungmin82.ha@samsung.com>
Thu, 5 Jul 2012 05:06:29 +0000 (14:06 +0900)

Trivial merge