Merge branch 'develop' into release
authorSooyoung Ha <yoosah.ha@samsung.com>
Mon, 19 Nov 2012 03:01:42 +0000 (12:01 +0900)
committerSooyoung Ha <yoosah.ha@samsung.com>
Mon, 19 Nov 2012 03:01:42 +0000 (12:01 +0900)

Trivial merge