Alexandre Julliard : Merge branch 'upstream'.

[Alexandre Julliard]

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

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Wed Sep 19 23:46:06 2012 +0200

Merge branch 'upstream'.

---