From f31c9e46eb51fdd967acb2bf27cf11bfb4b13231 Mon Sep 17 00:00:00 2001
From: Gary Martin <gary@garycmartin.com>
Date: Thu, 17 Jun 2010 03:41:51 +0000
Subject: Merged and manualy fixed conflict.

---
(limited to 'icons')

--
cgit v0.9.1