[empathy: 2/2] Merge branch 'zephyr'

[Guillaume Desmottes <gdesmott src gnome org>]

commit 6595e1660bb1dc21fc7fefb6fe6a9e925f9189c3
Merge: fe9e7dd 66dd2eb
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Tue Feb 9 11:56:47 2010 +0000

    Merge branch 'zephyr'

 data/icons/Makefile.am                         |    6 +
 data/icons/hicolor_apps_16x16_im-zephyr.png    |  Bin 0 -> 695 bytes
 data/icons/hicolor_apps_22x22_im-zephyr.png    |  Bin 0 -> 995 bytes
 data/icons/hicolor_apps_24x24_im-zephyr.png    |  Bin 0 -> 1049 bytes
 data/icons/hicolor_apps_32x32_im-zephyr.png    |  Bin 0 -> 1500 bytes
 data/icons/hicolor_apps_48x48_im-zephyr.png    |  Bin 0 -> 2303 bytes
 data/icons/hicolor_apps_scalable_im-zephyr.svg |  182 ++++++++++++++++++++++++
 7 files changed, 188 insertions(+), 0 deletions(-)
---