[FFmpeg-cvslog] Merge commit 'b634b36fcebfe16b837b6c4044f5d5cb99a75040'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Sep  6 12:05:02 2013 +0200| [92424a45d0c3154ad83aaba6e0fb8dbb17d8d1a4] | committer: Michael Niedermayer

Merge commit 'b634b36fcebfe16b837b6c4044f5d5cb99a75040'

* commit 'b634b36fcebfe16b837b6c4044f5d5cb99a75040':
  mem: Improve documentation wording and spelling

Conflicts:
	libavutil/mem.c
	libavutil/mem.h

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

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