Merge with EFL svn repo
authorDaniel Juyung Seo <juyung.seo@samsung.com>
Mon, 7 Jun 2010 10:11:54 +0000 (19:11 +0900)
committerDaniel Juyung Seo <juyung.seo@samsung.com>
Mon, 7 Jun 2010 10:11:54 +0000 (19:11 +0900)
commit80e4674d53a01f38ae51725d675e1b6791ae522a
treefd3c256ee4541a41ed1a5bd39fcecef3deaa1563
parentdf46237e49d0c0895972e5ae2575a0e74bf1f792
parentd8bc35a117109ba043f9f899467d1d36a303b2eb
Merge with EFL svn repo

Merge branch 'svn_merge'

Conflicts:
src/lib/elm_index.c
configure.ac
data/themes/default.edc
src/lib/Elementary.h.in
src/lib/Makefile.am
src/lib/elc_scrolled_entry.c
src/lib/elm_entry.c
src/lib/elm_genlist.c
src/lib/elm_index.c
src/lib/els_scroller.c