Merge branch 'develop' into internal_release
authorsungmin ha <sungmin82.ha@samsung.com>
Wed, 4 Jul 2012 13:20:08 +0000 (22:20 +0900)
committersungmin ha <sungmin82.ha@samsung.com>
Wed, 4 Jul 2012 13:20:08 +0000 (22:20 +0900)

Trivial merge