Merged revision(s) 58241-58355 from trunk/blender into soc-2013-dingto.
authorThomas Dinges <blender@dingto.org>
Wed, 17 Jul 2013 21:43:38 +0000 (21:43 +0000)
committerThomas Dinges <blender@dingto.org>
Wed, 17 Jul 2013 21:43:38 +0000 (21:43 +0000)

Trivial merge