[banshee/grid: 20/20] Merge branch 'master' into grid

[Aaron Bockover <abock src gnome org>]

commit 7b5460988d6699f82c4e3c9c5ab858c34889c835
Merge: 6b5d295... d446688...
Author: Aaron Bockover <abockover novell com>
Date:   Tue Dec 15 17:07:59 2009 -0500

    Merge branch 'master' into grid

 build/Makefile.am                                  |    3 +-
 build/addin-xml-string-extract                     |   45 +++++
 build/build.environment.mk                         |    1 +
 build/build.rules.mk                               |   11 +-
 configure.ac                                       |    1 +
 data/Makefile.am                                   |   12 ++-
 data/addin-xml-strings.cs                          |  180 +++++++++++++++++++
 po/POTFILES.in                                     |   52 +++---
 .../Banshee.Widgets/DictionaryComboBox.cs          |   81 ++++++---
 ...pod.addin.xml.in => Banshee.Dap.Ipod.addin.xml} |    4 +-
 .../Banshee.Dap.Ipod/IpodSource.cs                 |    4 +-
 src/Dap/Banshee.Dap.Ipod/Makefile.am               |    2 +-
 ...ma.addin.xml.in => Banshee.Dap.Karma.addin.xml} |    4 +-
 src/Dap/Banshee.Dap.Karma/Makefile.am              |    2 +-
 ...in.xml.in => Banshee.Dap.MassStorage.addin.xml} |    4 +-
 ....Mtp.addin.xml.in => Banshee.Dap.Mtp.addin.xml} |    4 +-
 src/Dap/Banshee.Dap.Mtp/Makefile.am                |    2 +-
 src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapContent.cs  |   62 ++++++-
 .../Banshee.Dap.Gui/LibrarySyncOptions.cs          |  165 +++++++++++++++++
 ...shee.Dap.addin.xml.in => Banshee.Dap.addin.xml} |    4 +-
 src/Dap/Banshee.Dap/Banshee.Dap/DapLibrarySync.cs  |   56 +++---
 src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs         |  185 ++++++++++++--------
 src/Dap/Banshee.Dap/Makefile.am                    |    1 +
 ...ioCd.addin.xml.in => Banshee.AudioCd.addin.xml} |    4 +-
 .../Banshee.Audiobook.addin.xml}                   |   12 +-
 .../Banshee.Audiobook/Banshee.Audiobook.csproj     |   84 +++++++++
 .../Banshee.Audiobook/AudiobookLibrarySource.cs    |   84 +++++++++
 src/Extensions/Banshee.Audiobook/Makefile.am       |   12 ++
 ...pt.addin.xml.in => Banshee.BooScript.addin.xml} |    4 +-
 src/Extensions/Banshee.BooScript/Makefile.am       |    9 +-
 ...ks.addin.xml.in => Banshee.Bookmarks.addin.xml} |    4 +-
 ...shee.Bpm.addin.xml.in => Banshee.Bpm.addin.xml} |    4 +-
 ...Art.addin.xml.in => Banshee.CoverArt.addin.xml} |    4 +-
 ...ee.Daap.addin.xml.in => Banshee.Daap.addin.xml} |    4 +-
 src/Extensions/Banshee.Daap/Makefile.am            |    2 +-
 ...in.xml.in => Banshee.FileSystemQueue.addin.xml} |    4 +-
 ...in.xml.in => Banshee.InternetArchive.addin.xml} |    4 +-
 ...ddin.xml.in => Banshee.InternetRadio.addin.xml} |    4 +-
 ...astfm.addin.xml.in => Banshee.Lastfm.addin.xml} |    4 +-
 ...ode.addin.xml.in => Banshee.MiniMode.addin.xml} |    4 +-
 ...din.xml.in => Banshee.MultimediaKeys.addin.xml} |    4 +-
 src/Extensions/Banshee.MultimediaKeys/Makefile.am  |    2 +-
 ...n.xml.in => Banshee.NotificationArea.addin.xml} |    4 +-
 .../Banshee.NotificationArea/Makefile.am           |    7 +-
 ...g.addin.xml.in => Banshee.NowPlaying.addin.xml} |    4 +-
 ...ue.addin.xml.in => Banshee.PlayQueue.addin.xml} |    4 +-
 ...in.xml.in => Banshee.PlayerMigration.addin.xml} |    4 +-
 ...g.addin.xml.in => Banshee.Podcasting.addin.xml} |    4 +-
 src/Extensions/Banshee.Podcasting/Makefile.am      |    9 +-
 ...rent.addin.xml.in => Banshee.Torrent.addin.xml} |    4 +-
 src/Extensions/Banshee.Torrent/Makefile.am         |    2 +-
 ...ia.addin.xml.in => Banshee.Wikipedia.addin.xml} |    4 +-
 src/Extensions/Banshee.Wikipedia/Makefile.am       |    2 +-
 src/Extensions/Makefile.am                         |    1 +
 .../Hyena.Gui/Hyena.Widgets/SimpleTable.cs         |  103 +++++++++++
 src/Libraries/Hyena.Gui/Makefile.am                |    1 +
 56 files changed, 1042 insertions(+), 249 deletions(-)
---