peterm
committed
on 22 Sep 03
restructuring the query a little for readability