Merging r58166 through r58193 from trunk into soc-2013-depsgraph_mt
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 12 Jul 2013 09:13:15 +0000 (09:13 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 12 Jul 2013 09:13:15 +0000 (09:13 +0000)

Trivial merge