Merge tag 'upstream/2012.12.11'

Upstream version 2012.12.11

diff --combined .gitignore
index 6c532b46ae0dd1fe2cbdd3f98548978eaf9fb972,996489d8ec6becd3a441cdbecd1f83c31eea944d..b13aa177d91b60eaa76d61d3a5cb6554eb9123ab
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -1,6 -1,15 +1,16 @@@
  *.pyc
  *.pyo
  *~
 +/.pc
  wine-py2exe/
  py2exe.log
+ *.kate-swp
+ build/
+ dist/
+ MANIFEST
+ README.txt
+ youtube-dl.1
+ youtube-dl.bash-completion
+ youtube-dl
+ youtube-dl.exe
+ youtube-dl.tar.gz