CRM-14096 make d6 config file exactly the same as d7
Merge pull request #110 from eileenmcnaughton/6.x-4.4

CRM-14096 civicrm.config code doesn't do a good job when civicrm not in ...
Merge remote-tracking branch 'upstream/6.x-4.4' into 6.x-4.4-6.x-master-2014-02-03-14-40-28