Merged revision(s) 59108-59184 from trunk/blender into soc-2013-dingto.
authorThomas Dinges <blender@dingto.org>
Fri, 16 Aug 2013 12:50:13 +0000 (12:50 +0000)
committerThomas Dinges <blender@dingto.org>
Fri, 16 Aug 2013 12:50:13 +0000 (12:50 +0000)

Trivial merge