Merge branch 'master' into tizen_2.0
authorSunghyun Kwon <sh0701.kwon@samsung.com>
Wed, 23 Jan 2013 13:41:20 +0000 (22:41 +0900)
committerSunghyun Kwon <sh0701.kwon@samsung.com>
Wed, 23 Jan 2013 13:41:20 +0000 (22:41 +0900)

Trivial merge