Merge branch 'develop' into release
authorjihye kim <jihye1128.kim@samsung.com>
Mon, 12 Nov 2012 07:17:38 +0000 (16:17 +0900)
committerjihye kim <jihye1128.kim@samsung.com>
Mon, 12 Nov 2012 07:17:38 +0000 (16:17 +0900)

Trivial merge