Merge branch 'master' into tizen_2.0
authorSooyoung Ha <yoosah.ha@samsung.com>
Thu, 10 Jan 2013 06:50:26 +0000 (15:50 +0900)
committerSooyoung Ha <yoosah.ha@samsung.com>
Thu, 10 Jan 2013 06:50:26 +0000 (15:50 +0900)

Trivial merge