Merge branch 'master' into tizen_2.0
authorJunghyun Kim <jh1114.kim@samsung.com>
Thu, 3 Jan 2013 07:53:27 +0000 (16:53 +0900)
committerJunghyun Kim <jh1114.kim@samsung.com>
Thu, 3 Jan 2013 07:53:27 +0000 (16:53 +0900)

Trivial merge