[Bf-blender-cvs] [483aea9] blender-tiles: Merge remote-tracking branch 'blender-upstream/master' into blender-tiles

[Jeroen Bakker]

Commit: 483aea9a0eb2e93a30fa956bbc6fd41efac1fcc9
Author: Jeroen Bakker
Date:   Tue Aug 5 19:10:55 2014 +0200
Branches: blender-tiles
https://developer.blender.org/rB483aea9a0eb2e93a30fa956bbc6fd41efac1fcc9

Merge remote-tracking branch 'blender-upstream/master' into blender-tiles

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



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