Migration with svn revision 66966
authorJaehwan Kim <jae.hwan.kim@samsung.com>
Mon, 9 Jan 2012 02:22:13 +0000 (11:22 +0900)
committerJaehwan Kim <jae.hwan.kim@samsung.com>
Mon, 16 Jan 2012 07:49:00 +0000 (16:49 +0900)
commitae3e1bb0631824ded9971f4d78d3e527739d69ab
treec237c527ead4d88e128cf4483621f9c12a913177
parentfde578be6bc84d6703818a4d66cb87b4a0e0b181
parent2754ab1186e39b655a567b5adca7396ccf1d3631
Migration with svn revision 66966
Merge remote branch 'origin/upstream'

Conflicts:
src/lib/canvas/evas_callbacks.c
src/lib/canvas/evas_events.c
src/lib/canvas/evas_focus.c
src/lib/canvas/evas_map.c
src/lib/cache/evas_cache_image.c
src/lib/canvas/evas_events.c
src/lib/canvas/evas_map.c
src/lib/canvas/evas_object_image.c
src/modules/engines/gl_common/evas_gl_texture.c
src/modules/loaders/gif/evas_image_load_gif.c