Merge branch 'master' into tizen_2.0
authorSunghyun Kwon <sh0701.kwon@samsung.com>
Fri, 11 Jan 2013 06:52:12 +0000 (15:52 +0900)
committerSunghyun Kwon <sh0701.kwon@samsung.com>
Fri, 11 Jan 2013 06:52:12 +0000 (15:52 +0900)

Trivial merge