Merging r39173 through r39178 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 8 Aug 2011 12:11:40 +0000 (12:11 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 8 Aug 2011 12:11:40 +0000 (12:11 +0000)
1  2 
release/scripts/startup/bl_ui/space_userpref_keymap.py
source/blender/editors/interface/interface_templates.c
source/blender/makesrna/RNA_access.h

Simple merge