[FFmpeg-cvslog] Merge commit 'b58b00aeca21de00ab6da2944684f784d9d6bc47'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Feb 26 12:32:17 2013 +0100| [2b277f2992d66b7f02fdf8d3642c326087d362a9] | committer: Michael Niedermayer

Merge commit 'b58b00aeca21de00ab6da2944684f784d9d6bc47'

* commit 'b58b00aeca21de00ab6da2944684f784d9d6bc47':
  configure: Separate "ln" command line arguments

Conflicts:
	configure

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

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