[FFmpeg-cvslog] Merge commit 'c74f81786d434dfaf9b3dff06aa96bfd23d0127b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 29 14:07:51 2012 +0100| [52066bdb300b3a2cdef48897d0c864410b259084] | committer: Michael Niedermayer

Merge commit 'c74f81786d434dfaf9b3dff06aa96bfd23d0127b'

* commit 'c74f81786d434dfaf9b3dff06aa96bfd23d0127b':
  nuv: cosmetics: pretty-printing

Conflicts:
	libavformat/nuv.c

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

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