Alexandre Julliard : Merge branch 'upstream'.

[Alexandre Julliard]

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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Sep 22 15:15:02 2011 +0200

Merge branch 'upstream'.

Conflicts:
	Bugzilla/Attachment.pm
	skins/contrib/Dusk/.cvsignore
	skins/standard/global.css
	template/en/default/bug/edit.html.tmpl
	template/en/default/global/common-links.html.tmpl
	template/en/default/global/footer.html.tmpl
	template/en/default/global/header.html.tmpl
	template/en/default/index.html.tmpl

---