Merge branch 'release' into develop
authorjiil.hyoun <jiil.hyoun@samsung.com>
Tue, 4 Sep 2012 13:14:42 +0000 (22:14 +0900)
committerjiil.hyoun <jiil.hyoun@samsung.com>
Tue, 4 Sep 2012 13:14:42 +0000 (22:14 +0900)

Trivial merge