(cherry picked from commit be262960c031fbab9e2600969b08e516f20b6679)

Conflicts:

	projects/mozilla/vlcshell.cpp