Merge branch '2.0'
authorJisung Ahn <jcastle.ahn@samsung.com>
Mon, 21 Jan 2013 11:44:39 +0000 (20:44 +0900)
committerJisung Ahn <jcastle.ahn@samsung.com>
Mon, 21 Jan 2013 11:44:39 +0000 (20:44 +0900)
commit28db395f800b93ef3e2882fac861c44a83c9da85
tree50f6dda48d97b7a68d28025e7a9b5bdb6094bbdf
parentd24b71aa0fa8e374cfbf2a3be568e0c63841de51
parent3f75bc7b858df8ece7f045b6ff8090d483efeeca
Merge branch '2.0'