Merge branch 'develop' into internal_release
authorsungmin ha <sungmin82.ha@samsung.com>
Thu, 5 Jul 2012 12:18:33 +0000 (21:18 +0900)
committersungmin ha <sungmin82.ha@samsung.com>
Thu, 5 Jul 2012 12:18:33 +0000 (21:18 +0900)

Trivial merge