Overriding default properties

Is there a clean way to override custom properties in a separate file without modifying the default properties-*.xml files?

I want to do this so that I don't need to merge the properties-*.xml files each time I update with a new Orbeon release or build.

I would be grateful for any help!
-Gino

You can put your custom properties in a file called properties-local.xml.

http://wiki.orbeon.com/forms/doc/developer-guide/configuration-properties

That's exactly what I was looking for.. thanks a million!
-Gino