[Bf-blender-cvs] [fa4484f] bake-cycles: Merge remote-tracking branch 'upstream/master' into bake-cycles (this should fix the windows build error with makesrna)

[Dalai Felinto]

Commit: fa4484fd52d81deb52296da27eb70e4a7d42a8e6
Author: Dalai Felinto
Date:   Wed Apr 30 04:38:18 2014 -0300
https://developer.blender.org/rBfa4484fd52d81deb52296da27eb70e4a7d42a8e6

Merge remote-tracking branch 'upstream/master' into bake-cycles
(this should fix the windows build error with makesrna)

===================================================================



===================================================================