Merge commit 'rob/config-refactor' into config-refactor
commit26ad34c5fee0516790774d28ed0dafd8d8d4dc01
authorDieter Plaetinck <dieter@plaetinck.be>
Thu, 14 May 2009 20:24:13 +0000 (14 22:24 +0200)
committerDieter Plaetinck <dieter@plaetinck.be>
Thu, 14 May 2009 20:24:13 +0000 (14 22:24 +0200)
tree0d734557f1bd92e77182664d84577140fb696c39
parent7ffea9d233f35b29ee825904fe0e0cc11ee623e4
parenta5d12d1264e65c213b2739cb2ae24099c938cff6
Merge commit 'rob/config-refactor' into config-refactor