Merge branch 'master' into tizen_2.0
authorSooyoung Ha <yoosah.ha@samsung.com>
Fri, 4 Jan 2013 08:10:26 +0000 (17:10 +0900)
committerSooyoung Ha <yoosah.ha@samsung.com>
Fri, 4 Jan 2013 08:10:26 +0000 (17:10 +0900)

Trivial merge