Merge branch 'develop' into release
authorsungmin ha <sungmin82.ha@samsung.com>
Mon, 27 Aug 2012 12:45:26 +0000 (21:45 +0900)
committersungmin ha <sungmin82.ha@samsung.com>
Mon, 27 Aug 2012 12:45:26 +0000 (21:45 +0900)

Trivial merge