Merge "Update Flora License" into tizen_2.1
authorJaehwan Lee <jh8379.lee@samsung.com>
Tue, 30 Apr 2013 08:15:32 +0000 (17:15 +0900)
committerGerrit Code Review <gerrit2@kim11>
Tue, 30 Apr 2013 08:15:32 +0000 (17:15 +0900)

Trivial merge