Merge branch 'develop' into avcodec
authorPaul Brossier <piem@piem.org>
Fri, 6 Dec 2013 02:30:20 +0000 (21:30 -0500)
committerPaul Brossier <piem@piem.org>
Fri, 6 Dec 2013 02:30:20 +0000 (21:30 -0500)

Trivial merge