Merged revision(s) 58779, 58783-58784 from trunk/blender into soc-2013-dingto.
authorThomas Dinges <blender@dingto.org>
Wed, 31 Jul 2013 21:49:10 +0000 (21:49 +0000)
committerThomas Dinges <blender@dingto.org>
Wed, 31 Jul 2013 21:49:10 +0000 (21:49 +0000)

Trivial merge