Merge branch 'master' of git://lxde.git.sourceforge.net/gitroot/lxde/lxde-icon-theme