Merge branch 'master' into tizen_2.0
authorJin Yoon <jinny.yoon@samsung.com>
Tue, 15 Jan 2013 10:28:29 +0000 (19:28 +0900)
committerJin Yoon <jinny.yoon@samsung.com>
Tue, 15 Jan 2013 10:28:29 +0000 (19:28 +0900)

Trivial merge