Merge branch 'master' into tizen_2.1
authorJunghyun Kim <jh1114.kim@samsung.com>
Fri, 3 May 2013 09:20:29 +0000 (18:20 +0900)
committerJunghyun Kim <jh1114.kim@samsung.com>
Fri, 3 May 2013 09:20:29 +0000 (18:20 +0900)

Trivial merge