Merge branch '2.0'
authorJisung Ahn <jcastle.ahn@samsung.com>
Sun, 27 Jan 2013 10:10:28 +0000 (19:10 +0900)
committerJisung Ahn <jcastle.ahn@samsung.com>
Sun, 27 Jan 2013 10:10:28 +0000 (19:10 +0900)
commit4cd3b8a6be35a3d8a20568bb0b38b2b62af6b7c4
treecada29d41b8b05d90156dec853e70d7184bd1715
parent0c21ff2d56b5584124bf13cb266e3d098b31c364
parent7f1f56ea0fd424cee054f2981c894532a2aa340e
Merge branch '2.0'