Merge commit 'holizz/new_experimental' into experimental
authorDieter Plaetinck <dieter@plaetinck.be>
Sat, 18 Jul 2009 07:33:47 +0000 (09:33 +0200)
committerDieter Plaetinck <dieter@plaetinck.be>
Sat, 18 Jul 2009 07:33:47 +0000 (09:33 +0200)

Trivial merge