Merging r57629 through r57694 from trunk into soc-2013-depsgraph_mt
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 24 Jun 2013 12:30:05 +0000 (12:30 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 24 Jun 2013 12:30:05 +0000 (12:30 +0000)

Trivial merge