Merge branch 'master' into tizen_2.0
authorJunghyun Kim <jh1114.kim@samsung.com>
Fri, 18 Jan 2013 01:31:43 +0000 (10:31 +0900)
committerJunghyun Kim <jh1114.kim@samsung.com>
Fri, 18 Jan 2013 01:31:43 +0000 (10:31 +0900)

Trivial merge