[Bf-codereview] Pepper to trunk merge (issue 4934047)

[brechtvanlommel at gmail.com]

Regarding the Audio panel for scenes, I get this python error when
compiling without ffmpeg:

/Users/brecht/dev/review/build/bin/blender.app/Contents/MacOS/2.59/scripts/startup/bl_ui/properties_scene.py:72
rna_uiItemR: property not found: RenderSettings.ffmpeg_audio_channels


http://codereview.appspot.com/4934047/