Alexandre Julliard : Merge branch 'upstream'.

[Alexandre Julliard]

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

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Fri Sep 23 16:03:04 2011 +0200

Merge branch 'upstream'.

Conflicts:
	template/en/default/attachment/list.html.tmpl
	template/en/default/bug/edit.html.tmpl
	template/en/default/global/common-links.html.tmpl
	template/en/default/list/table.html.tmpl
	template/en/default/pages/fields.html.tmpl

---