upstream merge
authorsangho park <sangho.g.park@samsung.com>
Thu, 28 Apr 2011 08:50:05 +0000 (17:50 +0900)
committersangho park <sangho.g.park@samsung.com>
Thu, 28 Apr 2011 08:50:05 +0000 (17:50 +0900)
commit057d29dfcc04dcf712bb4f0d416a923715df52c3
tree3877d80dac92940e2336abe82968b9fa7b73f15c
parentda7eec4da2780caa33eef6c0e414c1bd6388a14f
upstream merge

Change-Id: I20ca8959b68d1487ec9210040f46c1a26461d603
src/bin/test_map.c
src/lib/Elementary.h.in
src/lib/elm_map.c
src/lib/els_scroller.c
src/lib/els_scroller.h