Merge branch '2.0'
authorJisung Ahn <jcastle.ahn@samsung.com>
Wed, 30 Jan 2013 07:49:34 +0000 (16:49 +0900)
committerJisung Ahn <jcastle.ahn@samsung.com>
Wed, 30 Jan 2013 07:49:34 +0000 (16:49 +0900)
commit3920c64239e61734b97789db4c944ca481de94e5
tree6da299e331fa1c1313a6ed4a075bc6a74f8ae3fd
parent4cd3b8a6be35a3d8a20568bb0b38b2b62af6b7c4
parent9227d33964656f307bcc94a9983c2890221611fd
Merge branch '2.0'