hal/fdi/20freedesktop Makefile.am, 1.5, 1.6 ide-drives.fdi, 1.1, 1.2 usb-zip-drives.fdi, 1.1, 1.2

[David Zeuthen]

Update of /cvs/hal/hal/fdi/20freedesktop
In directory gabe:/tmp/cvs-serv31002/fdi/20freedesktop

Modified Files:
	Makefile.am 
Added Files:
	ide-drives.fdi usb-zip-drives.fdi 
Log Message:
2004-12-13  David Zeuthen  <davidz at redhat.com>

	Merged all changes from the stable branch so HEAD is on par.



Index: Makefile.am
===================================================================
RCS file: /cvs/hal/hal/fdi/20freedesktop/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.am	13 Oct 2004 13:50:07 -0000	1.5
+++ Makefile.am	14 Dec 2004 02:57:48 -0000	1.6
@@ -7,6 +7,9 @@
 	6in1-card-reader.fdi		\
 	lexar-media-cf-reader.fdi	\
 	lucent-pcmcia-wireless.fdi	\
-	jetflash-mp3-player.fdi
+	jetflash-mp3-player.fdi         \
+        ide-drives.fdi                  \
+        usb-zip-drives.fdi
+