Merge branch 'develop' into internal_release
authorsungmin ha <sungmin82.ha@samsung.com>
Mon, 16 Jul 2012 06:18:01 +0000 (15:18 +0900)
committersungmin ha <sungmin82.ha@samsung.com>
Tue, 17 Jul 2012 13:55:46 +0000 (22:55 +0900)

Trivial merge