[FFmpeg-cvslog] Merge commit '60a1ee6e419e244dc2363fdc4ddf8350d506f2ae' into release/0.10

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Sun Apr  7 14:43:37 2013 +0200| [9285f25e31a73900148b6fe6643ed82b055619cb] | committer: Michael Niedermayer

Merge commit '60a1ee6e419e244dc2363fdc4ddf8350d506f2ae' into release/0.10

* commit '60a1ee6e419e244dc2363fdc4ddf8350d506f2ae':
  doc: Fix some obsolete references to av* tools as ff* tools

Conflicts:
	doc/indevs.texi

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

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