Merge commit 'gcj/master' into experimental
authorDieter Plaetinck <dieter@plaetinck.be>
Tue, 26 May 2009 19:57:04 +0000 (21:57 +0200)
committerDieter Plaetinck <dieter@plaetinck.be>
Tue, 26 May 2009 19:57:04 +0000 (21:57 +0200)

Trivial merge