Merged revision(s) 58994-59032 from trunk/blender into soc-2013-dingto.
authorThomas Dinges <blender@dingto.org>
Fri, 9 Aug 2013 17:30:21 +0000 (17:30 +0000)
committerThomas Dinges <blender@dingto.org>
Fri, 9 Aug 2013 17:30:21 +0000 (17:30 +0000)

Trivial merge