Merge branch 'master' into tizen_2.1
authorSooyoung Ha <yoosah.ha@samsung.com>
Thu, 21 Mar 2013 05:31:21 +0000 (14:31 +0900)
committerSooyoung Ha <yoosah.ha@samsung.com>
Thu, 21 Mar 2013 05:31:21 +0000 (14:31 +0900)

Trivial merge