Merge branch 'master' into tizen_2.0
authorSan Cho <san.cho@samsung.com>
Fri, 1 Feb 2013 07:30:26 +0000 (16:30 +0900)
committerSan Cho <san.cho@samsung.com>
Fri, 1 Feb 2013 07:30:26 +0000 (16:30 +0900)

Trivial merge