svn merge ^/trunk/blender -r47067:47070
authorCampbell Barton <ideasman42@gmail.com>
Sun, 27 May 2012 12:23:20 +0000 (12:23 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 27 May 2012 12:23:20 +0000 (12:23 +0000)
1  2 
source/blender/blenkernel/intern/library.c
source/blender/editors/screen/screen_ops.c