[FFmpeg-cvslog] Merge commit '76eb0950b8d82b1e9617b9c854f091e13bb23131'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jun  3 18:26:17 2015 +0200| [c08a64bb2b12a48ce0e6ef41c0962774f599253e] | committer: Michael Niedermayer

Merge commit '76eb0950b8d82b1e9617b9c854f091e13bb23131'

* commit '76eb0950b8d82b1e9617b9c854f091e13bb23131':
  configure: Don't run "export $e" for an empty string

Conflicts:
	configure

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

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