Alexandre Julliard : Merge branch 'master' of www.winehq.org:/home/winehq/ opt/source/git/bugzilla.

[Alexandre Julliard]

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

Author: Alexandre Julliard 
Date:   Wed May 13 18:04:29 2009 +0200

Merge branch 'master' of www.winehq.org:/home/winehq/opt/source/git/bugzilla.

Conflicts:
    template/en/default/account/create.html.tmpl
    template/en/default/bug/create/create.html.tmpl

---