svn merge ^/trunk/blender -r48245:48254
authorCampbell Barton <ideasman42@gmail.com>
Mon, 25 Jun 2012 07:41:01 +0000 (07:41 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 25 Jun 2012 07:41:01 +0000 (07:41 +0000)
commit17516fee264e807443fc777fa1cc5fc668e4c74f
treeed8ce286282766a4ff0d37cb71fc6f924749a5cd
parent679dcfdf6385ba8c514200352f90bbba2037f61b
parent15cb064e1b853a56fc676db1c2869db47657d91a
svn merge ^/trunk/blender -r48245:48254