avahi-discover crashed with error in __init__(): (2, 'No such file or directory')

I just installed the avahi-discover package. When I execute it, I get the following traceback:

Traceback (most recent call last):
  File "/usr/bin/avahi-discover", line 57, in <module>
    service_type_db = avahi.ServiceTypeDatabase.ServiceTypeDatabase()
  File "/usr/lib/pymodules/python2.7/avahi/ServiceTypeDatabase.py", line 32, in __init__
    self.db = gdbm.open(filename, "r")

I debugged the code, and it looks for the filename "/usr/lib/i386-linux-gnu/avahi/service-types.db" which does not exist in my x86_64 Natty distribution. Actually, I modified it for "/usr/lib/x86_64-linux-gnu/avahi/service-types.db" and it worked fine.

So, I guess that the default 'filename' parameter in file /usr/lib/pymodules/python2.7/avahi/ServiceTypeDatabase.py line 29,
should be modified to be architecture dependent some how. That line contains the following:

def __init__(self, filename = "/usr/lib/i386-linux-gnu/avahi/service-types.db"):

So, I guess that the architecture should be discovered some how.

Thanks,

ProblemType: Crash
DistroRelease: Ubuntu 11.04
Package: avahi-discover 0.6.29-0ubuntu2
ProcVersionSignature: Ubuntu 2.6.38-7.39-generic 2.6.38
Uname: Linux 2.6.38-7-generic x86_64
NonfreeKernelModules: wl nvidia
Architecture: amd64
Date: Tue Mar 29 14:01:36 2011
ExecutablePath: /usr/bin/avahi-discover
InstallationMedia: Ubuntu 11.04 "Natty Narwhal" - Alpha amd64 (20110302)
InterpreterPath: /usr/bin/python2.7
ProcCmdline: /usr/bin/python /usr/bin/avahi-discover
ProcEnviron:
 SHELL=/bin/bash
 PATH=(custom, user)
 LANG=en_US.UTF-8
 LANGUAGE=en_US:en
PythonArgs: ['/usr/bin/avahi-discover']
SourcePackage: avahi
Title: avahi-discover crashed with error in __init__(): (2, 'No such file or directory')
UpgradeStatus: No upgrade log present (probably fresh install)
UserGroups: adm admin audio cdrom dialout dip fax floppy fuse lpadmin netdev nopasswdlogin plugdev sambashare tape vboxusers video