Merge branch 'master' of ssh://ffmpeg.org/home/git/hp
authorCompn <tempn@twmi.rr.com>
Thu, 31 Mar 2011 00:05:22 +0000 (20:05 -0400)
committerCompn <tempn@twmi.rr.com>
Thu, 31 Mar 2011 00:05:22 +0000 (20:05 -0400)

Trivial merge