[FFmpeg-cvslog] Merge commit 'e52567c2954f627d420b30f75f71af2f2e4afe80'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Oct  8 10:45:13 2013 +0200| [3d5a995eac2a47ac116c3412b364c0d21717829b] | committer: Michael Niedermayer

Merge commit 'e52567c2954f627d420b30f75f71af2f2e4afe80'

* commit 'e52567c2954f627d420b30f75f71af2f2e4afe80':
  build: Strip spurious labels

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3d5a995eac2a47ac116c3412b364c0d21717829b
---