Merge branch 'master' into tizen_2.1
authorJin Yoon <jinny.yoon@samsung.com>
Fri, 22 Mar 2013 04:45:40 +0000 (13:45 +0900)
committerJin Yoon <jinny.yoon@samsung.com>
Fri, 22 Mar 2013 04:45:40 +0000 (13:45 +0900)

Trivial merge