Merge commit 'rob/master' into experimental
commit4e69e5d250e72c8e150634710679c543f0461da0
authorDieter Plaetinck <dieter@plaetinck.be>
Thu, 7 May 2009 18:23:54 +0000 (7 20:23 +0200)
committerDieter Plaetinck <dieter@plaetinck.be>
Thu, 7 May 2009 18:23:54 +0000 (7 20:23 +0200)
treed14b9165549269cb7bd99dab182285c87476c16d
parent28f3992dee59aa53f86c3909cb2cb6ddf7613bb4
parentfc2bff84dcd3ed6cef5573bed345ca4107a16c59
Merge commit 'rob/master' into experimental