CVS: linux-atm/src Makefile.am,1.3,1.4

[chas w. <ch...@us...>]

Update of /cvsroot/linux-atm/linux-atm/src
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv18795/src

Modified Files:
	Makefile.am 
Log Message:
merge 2.5.1 branch into HEAD


Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.am	1 Jan 2008 00:14:49 -0000	1.3
--- Makefile.am	30 Nov 2009 16:56:52 -0000	1.4
***************
*** 1,3 ****
! SUBDIRS = include lib test debug qgen saal sigd maint arpd ilmid man led lane \
  		mpoad oamd switch config extra br2684
  
--- 1,3 ----
! SUBDIRS = include lib test debug qgen q2931 saal sigd maint arpd ilmid man led lane \
  		mpoad oamd switch config extra br2684