Merge branch 'develop' into staging
authorjiil.hyoun <jiil.hyoun@samsung.com>
Mon, 24 Dec 2012 07:22:54 +0000 (16:22 +0900)
committerjiil.hyoun <jiil.hyoun@samsung.com>
Mon, 24 Dec 2012 07:22:54 +0000 (16:22 +0900)

Trivial merge