Merged revision(s) 57369-57422 from trunk/blender into soc-2013-dingto.
authorThomas Dinges <blender@dingto.org>
Thu, 13 Jun 2013 08:06:09 +0000 (08:06 +0000)
committerThomas Dinges <blender@dingto.org>
Thu, 13 Jun 2013 08:06:09 +0000 (08:06 +0000)
Skipped r57368 (Wavelength node).


Trivial merge