Merging r59081 through r59082 from trunk into soc-2013-depsgraph_mt
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 12 Aug 2013 12:19:41 +0000 (12:19 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 12 Aug 2013 12:19:41 +0000 (12:19 +0000)

Trivial merge