Merge branch 'develop' into staging
authorjiil.hyoun <jiil.hyoun@samsung.com>
Thu, 29 Nov 2012 09:21:17 +0000 (18:21 +0900)
committerjiil.hyoun <jiil.hyoun@samsung.com>
Thu, 29 Nov 2012 09:21:17 +0000 (18:21 +0900)

Trivial merge