Merge branch 'staging' into develop
authorjiil.hyoun <jiil.hyoun@samsung.com>
Mon, 31 Dec 2012 05:21:58 +0000 (14:21 +0900)
committerjiil.hyoun <jiil.hyoun@samsung.com>
Mon, 31 Dec 2012 05:21:58 +0000 (14:21 +0900)

Trivial merge