[glibmm/vector: 5/5] Merge branch 'master' into vector

[Krzesimir Nowak <krnowak src gnome org>]

commit 641c7021c31e36ddeb29fc627c4754c56d2e254b
Merge: 031608b 1f73e89
Author: Krzesimir Nowak <qdlacz gmail com>
Date:   Thu Jan 27 21:52:06 2011 +0100

    Merge branch 'master' into vector
    
    Conflicts:
    	glib/glibmm/vectorutils.cc
    	glib/glibmm/vectorutils.h
    	glib/src/balancedtree.hg
    	tests/glibmm_bool_vector/main.cc
    	tests/glibmm_vector/main.cc

 .gitignore                       |    9 +-
 ChangeLog                        |   19 ++
 glib/glibmm/vectorutils.cc       |   26 ++--
 glib/glibmm/vectorutils.h        |  376 +++++++++++++++++++-------------------
 glib/src/balancedtree.hg         |    2 +-
 tests/glibmm_bool_vector/main.cc |   36 ++--
 tests/glibmm_vector/main.cc      |  360 ++++++++++++++++++------------------
 7 files changed, 425 insertions(+), 403 deletions(-)
---
diff --cc glib/src/balancedtree.hg
index 30065fd,101ba96..4402476
--- a/glib/src/balancedtree.hg
+++ b/glib/src/balancedtree.hg
@@@ -17,11 -17,6 +17,11 @@@
  
  _DEFS(glibmm,glib)
  
- #include <glib/gtree.h>
++#include <glib.h>
 +
 +#include <sigc++/bind.h>
 +#include <sigc++/slot.h>
 +
  #include <glibmm/refptr.h>
  #include <glibmm/ustring.h>
  #include <glibmm/error.h>