Merge branch 'dus/master' into experimental
authorDieter Plaetinck <dieter@plaetinck.be>
Sat, 2 May 2009 10:01:16 +0000 (12:01 +0200)
committerDieter Plaetinck <dieter@plaetinck.be>
Sat, 2 May 2009 10:01:16 +0000 (12:01 +0200)

Trivial merge