Merge branch 'release' into develop
authorjiil.hyoun <jiil.hyoun@samsung.com>
Wed, 5 Sep 2012 02:34:38 +0000 (11:34 +0900)
committerjiil.hyoun <jiil.hyoun@samsung.com>
Wed, 5 Sep 2012 02:34:38 +0000 (11:34 +0900)

Trivial merge