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

Trivial merge