Merge branch 'develop' into release
authorSooyoung Ha <yoosah.ha@samsung.com>
Tue, 27 Nov 2012 11:11:38 +0000 (20:11 +0900)
committerSooyoung Ha <yoosah.ha@samsung.com>
Tue, 27 Nov 2012 11:11:38 +0000 (20:11 +0900)

Trivial merge