Merge branch 'release-0.21' into develop
authorjonghwan2.park <jonghwan2.park@samsung.com>
Thu, 22 Mar 2012 07:37:22 +0000 (16:37 +0900)
committerjonghwan2.park <jonghwan2.park@samsung.com>
Thu, 22 Mar 2012 07:37:22 +0000 (16:37 +0900)

Trivial merge