pull in latest stuff from experimental
authorDieter Plaetinck <dieter@plaetinck.be>
Sat, 6 Jun 2009 21:30:43 +0000 (23:30 +0200)
committerDieter Plaetinck <dieter@plaetinck.be>
Sat, 6 Jun 2009 21:30:43 +0000 (23:30 +0200)

Trivial merge