Merged revision(s) 58585-58681 from trunk/blender into soc-2013-dingto.
authorThomas Dinges <blender@dingto.org>
Sun, 28 Jul 2013 06:17:10 +0000 (06:17 +0000)
committerThomas Dinges <blender@dingto.org>
Sun, 28 Jul 2013 06:17:10 +0000 (06:17 +0000)

Trivial merge