Merge branch 'private-develop' into develop
authorsungmin ha <sungmin82.ha@samsung.com>
Fri, 10 Aug 2012 10:46:04 +0000 (19:46 +0900)
committersungmin ha <sungmin82.ha@samsung.com>
Fri, 10 Aug 2012 10:46:04 +0000 (19:46 +0900)

Trivial merge