# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1178219784 0
# Node ID eda643d941f134356d85b5fa4bc4322705f2c767
# Parent  a26545a6409e2048e6a2f3151f5203327cb6ccb2# Parent  832c443a392f12488ad10570c6caef09b9180e71
merge of '3fafcf318bcb0b0099bc0ba5781451dd8ce0aa17'
     and 'ad01b5f940bbc213d855edbc346fc5109e9adb67'

diff -r a26545a6409e -r eda643d941f1 pidgin/pixmaps/tray/22/Makefile.am
--- a/pidgin/pixmaps/tray/22/Makefile.am	Thu May 03 19:13:08 2007 +0000
+++ b/pidgin/pixmaps/tray/22/Makefile.am	Thu May 03 19:16:24 2007 +0000
@@ -1,4 +1,4 @@
-SUBSIRS = scalable
+SUBDIRS = scalable
 
 TRAY_ICONS =	tray-away.png \
 		tray-busy.png \