Merge branch '2.0'
authorJisung Ahn <jcastle.ahn@samsung.com>
Fri, 25 Jan 2013 02:53:26 +0000 (11:53 +0900)
committerJisung Ahn <jcastle.ahn@samsung.com>
Fri, 25 Jan 2013 02:53:26 +0000 (11:53 +0900)
commit0c21ff2d56b5584124bf13cb266e3d098b31c364
treea82c66c393c8a39482e87c0f6cb561bcb5f9f128
parent28db395f800b93ef3e2882fac861c44a83c9da85
parentd35d5e241a00376b4c9dbc19c94689ece0780a29
Merge branch '2.0'