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

Trivial merge