Merged revision(s) 57979-58058 from trunk/blender into soc-2013-dingto
authorThomas Dinges <blender@dingto.org>
Sun, 7 Jul 2013 14:23:20 +0000 (14:23 +0000)
committerThomas Dinges <blender@dingto.org>
Sun, 7 Jul 2013 14:23:20 +0000 (14:23 +0000)

Trivial merge