Merge branch 'master' into tizen_2.0
authorSooyoung Ha <yoosah.ha@samsung.com>
Wed, 9 Jan 2013 17:35:55 +0000 (02:35 +0900)
committerSooyoung Ha <yoosah.ha@samsung.com>
Wed, 9 Jan 2013 17:35:55 +0000 (02:35 +0900)

Trivial merge