Alexandre Julliard : Merge branch 'upstream'.

[Alexandre Julliard]

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

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Wed May 13 14:38:41 2009 +0200

Merge branch 'upstream'.

Conflicts:
	.cvsignore
	docs/en/xml/.cvsignore
	skins/.cvsignore
	skins/standard/global.css
	template/en/default/bug/edit.html.tmpl
	template/en/default/email/newchangedmail.txt.tmpl
	template/en/default/global/common-links.html.tmpl
	template/en/default/global/header.html.tmpl
	template/en/default/global/useful-links.html.tmpl
	template/en/default/global/user-error.html.tmpl
	template/en/default/index.html.tmpl

---