Merging r57605 through r57628 from trunk into soc-2013-depsgraph_mt
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 21 Jun 2013 10:12:10 +0000 (10:12 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 21 Jun 2013 10:12:10 +0000 (10:12 +0000)

Trivial merge