Merging r41093 through r41119 from trunk into soc-2011-tomato

This revision wouldn't compile, fix will came soon with codereview-related changes.

release/scripts/startup/bl_operators/wm.py

@@ -1161,7 +1161,7 @@ class WM_OT_copy_prev_settings(Operator):
         elif not os.path.isdir(path_src):
             self.report({'ERROR'}, "Source path %r exists" % path_src)
         else:
-            shutil.copytree(path_src, path_dst)
+            shutil.copytree(path_src, path_dst, symlinks=True)
 
             # in 2.57 and earlier windows installers, system scripts were copied
             # into the configuration directory, don't want to copy those

release/scripts/startup/bl_ui/space_view3d.py

@@ -56,9 +56,9 @@ class VIEW3D_HT_header(Header):
 
         
         # Contains buttons like Mode, Pivot, Manipulator, Layer, Mesh Select Mode...
-        layout.template_header_3D()
+        row = layout.row() #XXX Narrowed down vert/edge/face selector in edit mode/solid drawmode. -DingTo 
+        row.template_header_3D()
         
-        row = layout.row()
         if obj:
             # Particle edit
             if obj.mode == 'PARTICLE_EDIT':