(cherry picked from commit 8749a60070100b42765472bfef4be6e1fb1731e8)

Conflicts:

	projects/mozilla/vlcshell.cpp