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

Trivial merge