[FFmpeg-cvslog] Merge commit 'dbd2a34ba5e5e46b6835e4425c360723c643b7a8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar  8 15:32:39 2013 +0100| [e9fbb9783c825250b4d06dded8ac2b712284b4e9] | committer: Michael Niedermayer

Merge commit 'dbd2a34ba5e5e46b6835e4425c360723c643b7a8'

* commit 'dbd2a34ba5e5e46b6835e4425c360723c643b7a8':
  build: cosmetics: Group hw accelerator Makefile entries together

Conflicts:
	libavcodec/Makefile

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

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