Merge branch 'master' into tizen_2.1
authorJin Yoon <jinny.yoon@samsung.com>
Tue, 19 Mar 2013 08:25:58 +0000 (17:25 +0900)
committerJin Yoon <jinny.yoon@samsung.com>
Tue, 19 Mar 2013 08:25:58 +0000 (17:25 +0900)

Trivial merge