Merge branch 'master' into tizen_2.1
authorJunghyun Kim <jh1114.kim@samsung.com>
Tue, 23 Apr 2013 05:02:10 +0000 (14:02 +0900)
committerJunghyun Kim <jh1114.kim@samsung.com>
Tue, 23 Apr 2013 05:02:10 +0000 (14:02 +0900)
Conflicts:
LICENSE.Flora


Trivial merge