Merge branch 'master' into tizen_2.0
authorSunghyun Kwon <sh0701.kwon@samsung.com>
Sat, 19 Jan 2013 08:08:04 +0000 (17:08 +0900)
committerSunghyun Kwon <sh0701.kwon@samsung.com>
Sat, 19 Jan 2013 08:08:04 +0000 (17:08 +0900)

Trivial merge