Merge branch 'release-0.21' into develop
authormunkyu.im <munkyu.im@samsung.com>
Thu, 22 Mar 2012 12:22:18 +0000 (21:22 +0900)
committermunkyu.im <munkyu.im@samsung.com>
Thu, 22 Mar 2012 12:22:18 +0000 (21:22 +0900)

Trivial merge