Merge commit 'rob/master' into experimental
commit5f6e00fa72e2b4bb319e91dc39765a1d022da050
authorDieter Plaetinck <dieter@plaetinck.be>
Thu, 7 May 2009 10:48:52 +0000 (7 12:48 +0200)
committerDieter Plaetinck <dieter@plaetinck.be>
Thu, 7 May 2009 10:48:52 +0000 (7 12:48 +0200)
tree1fe98c68321fbfa57fe8d6af4217cbee882c0956
parent3e340203c2f347527951ad65383f4267edbe1e3e
parent9ac279602b3ad6d0f908ef88e575216b72848d31
Merge commit 'rob/master' into experimental