Alexandre Julliard : Merge branch 'upstream'.

[Alexandre Julliard]

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

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Wed May 28 13:30:31 2008 +0200

Merge branch 'upstream'.

---