Merging r41597 through r41607 from trunk into soc-2011-tomato

diff --cc source/blender/blenkernel/intern/library.c
Simple merge

diff --cc source/blender/blenkernel/intern/node.c
Simple merge

diff --cc source/blender/blenkernel/intern/object.c
Simple merge

diff --cc source/blender/editors/gpencil/gpencil_edit.c
Simple merge

diff --cc source/blender/editors/gpencil/gpencil_paint.c
Simple merge

diff --cc source/blender/editors/interface/interface_widgets.c
Simple merge

diff --cc source/blender/editors/space_view3d/drawobject.c
Simple merge

diff --cc source/blender/editors/space_view3d/view3d_edit.c
Simple merge

diff --cc source/blender/editors/transform/transform.c
Simple merge

diff --cc source/blender/editors/transform/transform_generics.c
Simple merge

diff --cc source/blender/windowmanager/intern/wm_operators.c
Simple merge