[gnome-themes-standard/wip/toolbars-rework: 5/5] Merge branch 'master' into wip/toolbars-rework

[Lapo Calamandrei <lapo src gnome org>]

commit 72df0a155ceceba82c64556b8f2bd201e21c0665
Merge: 068766f 979375b
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Mon Nov 26 12:29:50 2012 +0100

    Merge branch 'master' into wip/toolbars-rework

 themes/Adwaita/gtk-3.0/assets/Makefile.am          |    2 +
 .../Adwaita/gtk-3.0/assets/noise-texture-dark.png  |  Bin 0 -> 69136 bytes
 .../Adwaita/gtk-3.0/assets/noise-texture-light.png |  Bin 0 -> 69136 bytes
 themes/Adwaita/gtk-3.0/gtk-widgets-assets-dark.css |   11 ++
 themes/Adwaita/gtk-3.0/gtk-widgets-assets.css      |    7 +
 .../Adwaita/gtk-3.0/gtk-widgets-borders-dark.css   |    9 --
 themes/Adwaita/gtk-3.0/gtk-widgets-borders.css     |   10 --
 themes/Adwaita/gtk-3.0/gtk-widgets.css             |  125 +++++++++-----------
 themes/Adwaita/gtk-3.0/gtk.gresource.xml           |    2 +
 9 files changed, 77 insertions(+), 89 deletions(-)
---