SVN merge r57315-57319 into soc-2013-dingto
authorThomas Dinges <blender@dingto.org>
Sun, 9 Jun 2013 20:28:16 +0000 (20:28 +0000)
committerThomas Dinges <blender@dingto.org>
Sun, 9 Jun 2013 20:28:16 +0000 (20:28 +0000)

Trivial merge