Merge branch 'master' into tizen_2.0
authorJunghyun Kim <jh1114.kim@samsung.com>
Wed, 16 Jan 2013 10:22:26 +0000 (19:22 +0900)
committerJunghyun Kim <jh1114.kim@samsung.com>
Wed, 16 Jan 2013 10:22:26 +0000 (19:22 +0900)

Trivial merge