[FFmpeg-cvslog] Merge commit '040c565e51985477a8fa5e42d2ddfb26ebde6608'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb 24 14:32:55 2013 +0100| [2fc662ae63ab79234f7c2996ad4e5c1993f85a18] | committer: Michael Niedermayer

Merge commit '040c565e51985477a8fa5e42d2ddfb26ebde6608'

* commit '040c565e51985477a8fa5e42d2ddfb26ebde6608':
  doc: developer: Allow tabs in the vim configuration for Automake files
  Remove pointless av_cold attributes in header files

Conflicts:
	libavcodec/h264.h

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

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