[blam/blam-1.8: 9/11] Merge branch 'blam-1.8.10' into blam-1.8

[Carlos MartÃn Nieto <cmartin src gnome org>]

commit a6513be1d58e53b54402c9e46a53dc88cc121b2b
Merge: 78fcc83 97459c7
Author: Carlos MartÃn Nieto <carlos cmartin tk>
Date:   Sat May 12 20:39:16 2012 +0200

    Merge branch 'blam-1.8.10' into blam-1.8

 Makefile.am                   |    1 +
 blam.exe.config               |    1 +
 configure.in                  |   32 ++++++++--------------------
 lib/Makefile.am               |    3 +-
 src/Application.cs            |   33 ++++++-----------------------
 src/ChannelCollection.cs      |    3 +-
 src/ChannelList.cs            |    5 +++-
 src/Defines.cs.in             |    2 +-
 src/ItemList.cs               |    6 ++--
 src/ItemView.cs               |    5 ++-
 src/Makefile.am               |   14 ++++--------
 src/gtk-sharp-beans/Global.cs |   46 +++++++++++++++++++++++++++++++++++++++++
 12 files changed, 83 insertions(+), 68 deletions(-)
---