Merge branch 'dev-40'

Conflicts:
	chromium-browser.spec

diff --cc chromium-browser.spec
index df2deda4496109864b2db35667ce5f1605b8658c,90de9863c722a9dc9a9ca6a5e07fe3f52949ce55..090550c52bcdd7ea90c52e21d599d2cc59e4b455
--- 1/chromium-browser.spec
--- 2/chromium-browser.spec
+++ b/chromium-browser.spec
@@@ -87,10 -87,10 +87,10 @@@ Release:   
  License:      BSD%{!?with_system_ffmpeg:, LGPL v2+ (ffmpeg)}
  Group:                X11/Applications/Networking
  Source0:      http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{branch}.%{basever}.tar.xz
- # Source0-md5:        238cbf816f3d3c01a58894a32eb9995d
+ # Source0-md5:        662f134029f2d6484873ec3c93a8e049
  %if "%{?patchver}" != ""
  Patch0:               http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{version}.patch.xz
 -# Patch0-md5: 1e03edf9545804bbc54ab3a77b1f4603
 +# Patch0-md5: d127c9de90e4b146b78b3000afc4dc1e
  %endif
  Source1:      %{name}.default
  Source2:      %{name}.sh