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)
commite7aadf01911171224c80c5a4b9a1a19daa7f359a
tree743a2c2f3a5c0551a3934b8d258b340375ef82cf
parentaaa98f8e81f7ff4f5f6cd4c692283b15518c60c7
parentdcc309c7de594c70cb7b8d7dc0851e5342a09996
Merge commit 'rob/master' into experimental