[FFmpeg-cvslog] Merge commit '4d810ad2e943a59658ddf00a397121c2b62f7157'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May  3 11:11:36 2013 +0200| [085a4e6b16bf31ad5a245a7de993d29ff98fb3ea] | committer: Michael Niedermayer

Merge commit '4d810ad2e943a59658ddf00a397121c2b62f7157'

* commit '4d810ad2e943a59658ddf00a397121c2b62f7157':
  configure: Use a different variable name in push/popvar

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

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