Build env fixes for latest HRC upmerges
catalog.xml splitted for easy mainteinance
Authored by: lomecb 2006-04-06
Parent: [r718]
Child: [r720]