Merge branch 'develop' into release
authorchanghyun1.lee <changhyun1.lee@samsung.com>
Fri, 31 Aug 2012 10:56:39 +0000 (19:56 +0900)
committerchanghyun1.lee <changhyun1.lee@samsung.com>
Fri, 31 Aug 2012 10:56:39 +0000 (19:56 +0900)

Trivial merge