Merge with bugfix-0.5

file:d8cf116d5c58a1e93f0e970e4aba3fea0647d2af -> file:448334f7040a186a0545b7a1f47e8d0211867e44
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
mp3togo
-(C) 2004, 2006 Simeon Veldstra <reallifesim@gmail.com>
+(C) 2004 - 2006 Simeon Veldstra <reallifesim@gmail.com>
INSTALLING
file:425208bd36d22dd89a0955e2b12034f20224fc4c -> file:e58b52ea0cf000ab21833d0415e8ceb5b7f0e079
--- a/copyright
+++ b/copyright
@@ -3,7 +3,7 @@ mp3togo
Software to manage playlists for mp3 players.
(C) Copyright 2004-2006 Simeon Veldstra <reallifesim@gmail.com>
-All rights reserved.
+Some rights reserved.
This software is free and may be redistributed under the
terms of the GNU General Public License, version 2 or later.
file:bb8a8e81035273728e3ae2f9afae169fc015a4cc -> file:a2eecc638ee26c3d6af04059679eff42d2163df2
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ on Wed, 26 Apr 2006 19:44:29 -0700.
The original source can always be found at:
ftp://ftp.debian.org/dists/unstable/main/source/
-Copyright (C) 2005 Simeon Veldstra
+Copyright (C) 2004 - 2006 Simeon Veldstra
License:
file:e845566c06f9bf557d35e8292c37cf05d97a9769 -> file:8b137891791fe96927ad78e64b0aad7bded08bdc
--- a/debian/docs
+++ b/debian/docs
@@ -1 +1 @@
-README
+
file:c15a7730fbfb69ca21437296afda6ba1cf7a0c97 -> file:3b27f8a0fcfcb5c2dcd12dfc1efb50d0d09819f1
--- a/debian/mp3togo.1
+++ b/debian/mp3togo.1
@@ -134,4 +134,4 @@ License can be found in /usr/share/commo
.PP
mp3togo can be found online at http://puddle.ca/mp3togo
-.\" created by instant / docbook-to-man, Wed 28 Jun 2006, 23:10
+.\" created by instant / docbook-to-man, Tue 04 Jul 2006, 06:03
file:ab5ad8d464e10e38873d54a275b8a34e81c632f9 -> file:5e06b7aa072fd7b158fa102ecbd4411a32429333
--- a/mp3togo/tags.py
+++ b/mp3togo/tags.py
@@ -101,7 +101,7 @@ class Tags(UserDict.DictMixin):
self._tags['ARTIST'] = [eye.getArtist() or '']
self._tags['ALBUM'] = [eye.getAlbum() or '']
self._tags['TITLE'] = [eye.getTitle() or '']
- self._tags['GENRE'] = [eye.getGenre().name or 'Other']
+ self._tags['GENRE'] = [getattr(eye.getGenre(), 'name', 'Other')]
del eye
elif HAVE_ID3:
info = ID3.ID3(self._file, as_tuple=1).as_dict()