[FFmpeg-cvslog] Merge commit '72e228b274a98af1aba9588415d0cd87fde44663'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May  5 11:19:12 2013 +0200| [057c5d2e1646ee9536edf514b41690c8ffeef6fc] | committer: Michael Niedermayer

Merge commit '72e228b274a98af1aba9588415d0cd87fde44663'

* commit '72e228b274a98af1aba9588415d0cd87fde44663':
  nut: K&R formatting cosmetics

Conflicts:
	libavformat/nut.c

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

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