[nanny: 3/3] Merge branch 'new-artwork'

[Roberto Majadas <telemaco src gnome org>]

commit 91016952659b8ccdfe903c79a012a707ec9a8030
Merge: a350a6e 7ef8928
Author: Roberto Majadas <roberto majadas openshine com>
Date:   Thu Apr 7 16:00:27 2011 +0200

    Merge branch 'new-artwork'

 client/common/icons/16x16/nanny.png    |  Bin 915 -> 492 bytes
 client/common/icons/22x22/nanny.png    |  Bin 1386 -> 600 bytes
 client/common/icons/24x24/nanny.png    |  Bin 1563 -> 668 bytes
 client/common/icons/256x256/nanny.png  |  Bin 39626 -> 5293 bytes
 client/common/icons/32x32/nanny.png    |  Bin 2303 -> 822 bytes
 client/common/icons/48x48/nanny.png    |  Bin 4126 -> 1334 bytes
 client/common/icons/scalable/nanny.svg | 1147 +-------------------------------
 daemon/data/bwww/block.png             |  Bin 0 -> 17015 bytes
 daemon/data/bwww/block.svg             |   98 +++
 daemon/data/bwww/header_background.png |  Bin 0 -> 157 bytes
 daemon/data/bwww/header_logo.png       |  Bin 0 -> 18058 bytes
 daemon/data/bwww/index.html            |   88 +++
 daemon/src/proxy/BadWebTemplate.py     |   90 +++
 daemon/src/proxy/Makefile.am           |    1 +
 daemon/src/proxy/TwistedProxy.py       |   24 +-
 15 files changed, 306 insertions(+), 1142 deletions(-)
---