Merge commit 'duc/experimental' into experimental
authorDieter Plaetinck <dieter@plaetinck.be>
Fri, 29 May 2009 21:38:13 +0000 (23:38 +0200)
committerDieter Plaetinck <dieter@plaetinck.be>
Fri, 29 May 2009 21:38:13 +0000 (23:38 +0200)
1  2 
examples/configs/sampleconfig-dev

Simple merge