Merge branch 'master' into tizen_2.0
authorSan Cho <san.cho@samsung.com>
Thu, 7 Feb 2013 10:15:34 +0000 (19:15 +0900)
committerSan Cho <san.cho@samsung.com>
Thu, 7 Feb 2013 10:15:34 +0000 (19:15 +0900)

Trivial merge