fix bad conflict resolution between ivan's and jeff's idea of how to use a different...
authorjeff <jeff>
Thu, 23 Sep 2010 21:27:36 +0000 (21:27 +0000)
committerjeff <jeff>
Thu, 23 Sep 2010 21:27:36 +0000 (21:27 +0000)
commite6c54cd41c23d8c0da9d5e0f66c20a571470d435
treeea15e99db1c268ee8f18015ee5dfddf131fbd7ea
parent4f3925e2d4db8181b70e9c04bf95f31760a8f7e2
fix bad conflict resolution between ivan's and jeff's idea of how to use a different freq
FS/FS/part_pkg.pm