Alexandre Julliard : Merge branch 'upstream'

[Alexandre Julliard]

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

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Tue Oct  9 12:11:57 2007 +0200

Merge branch 'upstream'

---