Vitaliy Margolen : Merge branch 'upstream'.

[Alexandre Julliard]

Module: bugzilla
Branch: master
Commit: 30911fe9c374329ff1afdbe3c5fe59444eac58ff
URL:    http://source.winehq.org/git/bugzilla.git/?a=commit;h=30911fe9c374329ff1afdbe3c5fe59444eac58ff

Author: Vitaliy Margolen <wine-patches at kievinfo.com>
Date:   Fri Aug 27 19:30:44 2010 +0200

Merge branch 'upstream'.

Conflicts:
	Bugzilla/DB/Mysql.pm
	skins/contrib/Dusk/.cvsignore
	skins/standard/global.css
	skins/standard/index.css
	template/en/default/global/header.html.tmpl
	template/en/default/index.html.tmpl

---