Merge branch 'master' into tizen_2.0
authorSooyoung Ha <yoosah.ha@samsung.com>
Mon, 21 Jan 2013 14:33:50 +0000 (23:33 +0900)
committerSooyoung Ha <yoosah.ha@samsung.com>
Mon, 21 Jan 2013 14:33:50 +0000 (23:33 +0900)

Trivial merge