Merge commit 'duc/experimental' into experimental
authorDieter Plaetinck <dieter@plaetinck.be>
Tue, 2 Jun 2009 20:53:57 +0000 (22:53 +0200)
committerDieter Plaetinck <dieter@plaetinck.be>
Tue, 2 Jun 2009 20:53:57 +0000 (22:53 +0200)
1  2 
docs/FAQ

diff --cc docs/FAQ
Simple merge