Merge branch '577_denoise_video_transcoding'
authorSebastian Spaeth <Sebastian@SSpaeth.de>
Fri, 21 Dec 2012 08:11:21 +0000 (09:11 +0100)
committerSebastian Spaeth <Sebastian@SSpaeth.de>
Fri, 21 Dec 2012 08:11:21 +0000 (09:11 +0100)

Trivial merge