Merge branch 'develop' into internal_release
authorsungmin ha <sungmin82.ha@samsung.com>
Tue, 10 Jul 2012 04:02:11 +0000 (13:02 +0900)
committersungmin ha <sungmin82.ha@samsung.com>
Tue, 10 Jul 2012 04:02:11 +0000 (13:02 +0900)

Trivial merge