Merge branch 'develop' into internal_release
authorsungmin ha <sungmin82.ha@samsung.com>
Mon, 9 Jul 2012 03:21:11 +0000 (12:21 +0900)
committersungmin ha <sungmin82.ha@samsung.com>
Mon, 9 Jul 2012 03:21:11 +0000 (12:21 +0900)

Trivial merge