gustafn
committed
on 26 Jun 07
handling recursive inclusions in a more generic way