merge upstream
authorsangho park <sangho.g.park@samsung.com>
Fri, 8 Apr 2011 09:14:56 +0000 (18:14 +0900)
committersangho park <sangho.g.park@samsung.com>
Fri, 8 Apr 2011 09:14:56 +0000 (18:14 +0900)
commit17937da7068f07521b0a43ae2f07bceef74799b8
treed8ff23c529b1d8948f85c8318662ed727b1c1f0e
parent7c7b99483d592abdb0fb8a6c7c631cdd12878986
merge upstream

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