[youtube-dl/f17: 6/6] Merge branch 'master' into f17

[Christopher Meng]

commit 9fc00fcfbf9ed827e67fc64aaff7539d1c964efb
Merge: f7ce773 db8d0ff
Author: Christopher Meng <rpm at cicku.me>
Date:   Thu Jul 11 13:15:06 2013 +0800

    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore

 .gitignore      |    6 +++---
 sources         |    3 +++
 youtube-dl.spec |   35 ++++++++++++++++++++++++++---------
 3 files changed, 32 insertions(+), 12 deletions(-)
---