Merge branch 'master' into tizen_2.1
authorJin Yoon <jinny.yoon@samsung.com>
Tue, 30 Apr 2013 05:27:58 +0000 (14:27 +0900)
committerJin Yoon <jinny.yoon@samsung.com>
Tue, 30 Apr 2013 05:27:58 +0000 (14:27 +0900)

Trivial merge