Merge branch 'master' into tizen_2.1
authorJin Yoon <jinny.yoon@samsung.com>
Tue, 23 Apr 2013 01:29:06 +0000 (10:29 +0900)
committerJin Yoon <jinny.yoon@samsung.com>
Tue, 23 Apr 2013 01:29:06 +0000 (10:29 +0900)

Trivial merge