Merged revision(s) 58059-58092 from trunk/blender into soc-2013-dingto.
authorThomas Dinges <blender@dingto.org>
Tue, 9 Jul 2013 00:58:25 +0000 (00:58 +0000)
committerThomas Dinges <blender@dingto.org>
Tue, 9 Jul 2013 00:58:25 +0000 (00:58 +0000)

Trivial merge