Merge commit 'rob/master' into experimental
authorDieter Plaetinck <dieter@plaetinck.be>
Wed, 27 May 2009 19:36:02 +0000 (21:36 +0200)
committerDieter Plaetinck <dieter@plaetinck.be>
Wed, 27 May 2009 19:36:02 +0000 (21:36 +0200)

Trivial merge