svn merge ^/trunk/blender -r47698:47701
authorCampbell Barton <ideasman42@gmail.com>
Sun, 10 Jun 2012 20:01:48 +0000 (20:01 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 10 Jun 2012 20:01:48 +0000 (20:01 +0000)

Trivial merge