Merge commit 'rob/config-refactor' into config-refactor
commit361d670520cb10efa25383b982eb85cab0ef8003
authorDieter Plaetinck <dieter@plaetinck.be>
Tue, 12 May 2009 18:52:29 +0000 (12 20:52 +0200)
committerDieter Plaetinck <dieter@plaetinck.be>
Tue, 12 May 2009 18:52:29 +0000 (12 20:52 +0200)
tree3eb1cbedbd2d54b5eeeac6a05aca63f07db292a2
parent6ebc2b46357d6324311da7ec667a5b53fae8cbab
parent0131a31934ae5330ad2bee7db89ce642f158bf5e
Merge commit 'rob/config-refactor' into config-refactor