[glade/internal-children: 7/7] Merge branch 'master' into internal-children

[Juan Pablo Ugarte <jpu src gnome org>]

commit e2d13a77f2fc742c5b4bd73527e91db7a3bc495f
Merge: 7dca3dc 2ac9be6
Author: Juan Pablo Ugarte <juanpablougarte gmail com>
Date:   Thu Mar 10 19:59:30 2011 -0300

    Merge branch 'master' into internal-children

 ChangeLog                       |   16 +-
 data/icons/Makefile.am          |    6 +-
 data/icons/deprecated-16x16.png |  Bin 0 -> 437 bytes
 data/icons/deprecated-22x22.png |  Bin 0 -> 671 bytes
 gladeui/glade-palette.c         |    9 +-
 gladeui/glade-widget-adaptor.c  |  108 +-
 po/POTFILES.in                  |    2 +
 po/en_GB.po                     | 6072 ++++++++++++++++++++-------------------
 po/pl.po                        |   71 +-
 9 files changed, 3352 insertions(+), 2932 deletions(-)
---