Merge branch 'develop' into internal_release
authorjihye kim <jihye1128.kim@samsung.com>
Thu, 5 Jul 2012 05:29:18 +0000 (14:29 +0900)
committerjihye kim <jihye1128.kim@samsung.com>
Thu, 5 Jul 2012 05:29:18 +0000 (14:29 +0900)

Trivial merge