Merge branch 'develop' into release
authorjihye kim <jihye1128.kim@samsung.com>
Tue, 20 Nov 2012 11:53:07 +0000 (20:53 +0900)
committerjihye kim <jihye1128.kim@samsung.com>
Tue, 20 Nov 2012 11:53:07 +0000 (20:53 +0900)

Trivial merge