Merge commit 'scj/master' into experimental
authorDieter Plaetinck <dieter@plaetinck.be>
Sat, 6 Jun 2009 20:04:09 +0000 (22:04 +0200)
committerDieter Plaetinck <dieter@plaetinck.be>
Sat, 6 Jun 2009 20:04:09 +0000 (22:04 +0200)

Trivial merge