Where to place config files after the project split?

[Matei Zaharia]

I've added a config file template for the fair scheduler recently and  
placed it in the conf directory in the mapreduce SVN. However, I  
checked out common recently and noticed that most of the other config  
files seem to be in common's conf directory (including core-site, hdfs- 
site, mapred-site, capacity-scheduler, etc). Should I copy my file  
into common? Or will the two conf directories eventually be merged for  
releases?

Matei