Merge remote-tracking branch 'origin/intefl/svn_merge'

Conflicts:
	src/lib/canvas/evas_map.c
	src/lib/canvas/evas_object_smart.c
	src/modules/engines/gl_common/evas_gl_common.h
	src/modules/engines/gl_x11/evas_engine.c

diff --cc src/lib/Evas_GL.h
Simple merge

diff --cc src/modules/engines/gl_x11/evas_engine.c
index 1f4d1c2,1cc6bf1..d1df85d
--- 1/src/modules/engines/gl_x11/evas_engine.c
--- 2/src/modules/engines/gl_x11/evas_engine.c
+++ b/src/modules/engines/gl_x11/evas_engine.c
@@@ -3419,7 -3380,15 +3419,6 @@@ _attach_fbo_surface(Render_Engine *dat
                                    GL_TEXTURE_2D, sfc->rt_tex, 0);
       }
  
 -<<<<<<< HEAD
 -   glBindFramebuffer(GL_FRAMEBUFFER, ctx->context_fbo);
 -
 -   // Render Target Texture
 -   if (sfc->rt_tex)
 -     {
 -        glBindTexture(GL_TEXTURE_2D, sfc->rt_tex );
 -=======
--
     // Depth Stencil RenderBuffer - Attach it to FBO
     if (sfc->rb_depth_stencil)
       {