donb
committed
on 24 Mar 04
Had to fix these to include package_id as well.