Merge commit 'rob/master' into experimental
authorDieter Plaetinck <dieter@plaetinck.be>
Fri, 29 May 2009 17:05:30 +0000 (19:05 +0200)
committerDieter Plaetinck <dieter@plaetinck.be>
Fri, 29 May 2009 17:05:30 +0000 (19:05 +0200)

Trivial merge