Merge branch 'master' into tizen_2.1
authorJunghyun Kim <jh1114.kim@samsung.com>
Thu, 2 May 2013 01:13:32 +0000 (10:13 +0900)
committerJunghyun Kim <jh1114.kim@samsung.com>
Thu, 2 May 2013 01:13:32 +0000 (10:13 +0900)

Trivial merge