Elementary migration revision 69832
authorJeonghyun Yun <jh0506.yun@samsung.com>
Mon, 2 Apr 2012 11:04:21 +0000 (20:04 +0900)
committerJeonghyun Yun <jh0506.yun@samsung.com>
Mon, 2 Apr 2012 11:04:21 +0000 (20:04 +0900)
commit94dcfa1e2e38aee503004c8667bb317797a28c86
treebc2b4d404f08998fa783f8de9001c21358e28194
parent857bb2218545a07ea7d22329e0b60de9d60ded2e
parentfca49789103ddc50469aa42a9e2b57d58bd5653c
Elementary migration revision 69832
Merge commit 'refs/changes/92/27392/1' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary

Conflicts:
src/lib/elm_entry.c
src/lib/elm_entry.c