[gtk-engines: 32/32] Merge remote branch 'origin/gnome3'

[Benjamin Berg <bberg src gnome org>]

commit 33e29ebc4c3a1c15751473649e003b918dbb3508
Merge: 8866e7f 023bb8b
Author: Benjamin Berg <benjamin sipsolutions net>
Date:   Wed Oct 13 19:18:14 2010 +0200

    Merge remote branch 'origin/gnome3'
    
    Conflicts:
    	engines/glide/src/glide_gtk2_drawing.c

 themes/GNOME3/gtk-2.0/gtkrc                        |  438 +++++++++
 themes/GNOME3/metacity-1/button_close.png          |  Bin 762 -> 0 bytes
 themes/GNOME3/metacity-1/button_maximize.png       |  Bin 577 -> 0 bytes
 themes/GNOME3/metacity-1/button_minimize.png       |  Bin 456 -> 0 bytes
 themes/GNOME3/metacity-1/left_button_edge.png      |  Bin 393 -> 0 bytes
 themes/GNOME3/metacity-1/menu_button_bg.png        |  Bin 247 -> 0 bytes
 .../GNOME3/metacity-1/menu_button_bg_prelight.png  |  Bin 231 -> 0 bytes
 themes/GNOME3/metacity-1/menu_button_close.png     |  Bin 191 -> 0 bytes
 themes/GNOME3/metacity-1/menu_button_maximize.png  |  Bin 161 -> 0 bytes
 themes/GNOME3/metacity-1/menu_button_minimize.png  |  Bin 139 -> 0 bytes
 themes/GNOME3/metacity-1/metacity-theme-1.xml      |  488 ----------
 themes/GNOME3/metacity-1/metacity-theme-2.xml      |  967 ++++++++++++++++++++
 12 files changed, 1405 insertions(+), 488 deletions(-)
---