Merge with master
authorJin Yoon <jinny.yoon@samsung.com>
Tue, 2 Apr 2013 04:14:09 +0000 (13:14 +0900)
committerJin Yoon <jinny.yoon@samsung.com>
Tue, 2 Apr 2013 04:14:09 +0000 (13:14 +0900)

Trivial merge