commit 281db406fd85549f25336d72c1a87fdc6c129c0c Merge: 1292c2a 8fdb6f6 Author: Jon Ciesla <limb at jcomserv.net> Date: Fri Oct 8 09:07:09 2010 -0500 Merge branch 'master' into el5 Conflicts: .gitignore ---