K 10
svn:author
V 10
nwhitehorn
K 8
svn:date
V 27
2010-04-07T15:09:35.999801Z
K 7
svn:log
V 70
Fix a mismerge in the modules Makefile.

Submitted by:	Justin Hibbits

END