Merge git://github.com/dbb/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Wed, 24 Aug 2011 21:34:09 +0000 (23:34 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Wed, 24 Aug 2011 21:34:09 +0000 (23:34 +0200)

Trivial merge