Merge with the master
authorJin Yoon <jinny.yoon@samsung.com>
Mon, 18 Mar 2013 08:56:27 +0000 (17:56 +0900)
committerJin Yoon <jinny.yoon@samsung.com>
Mon, 18 Mar 2013 08:56:27 +0000 (17:56 +0900)

Trivial merge