Merge commit 'rob/master' into experimental
authorDieter Plaetinck <dieter@plaetinck.be>
Wed, 27 May 2009 19:36:02 +0000 (21:36 +0200)
committerDieter Plaetinck <dieter@plaetinck.be>
Wed, 27 May 2009 19:36:02 +0000 (21:36 +0200)
commit54e715a564750413ae263d23a53b69ac5f31f58f
tree0ac8e22144c38b46eb3d8d64c4ae0513e4be55e6
parent84f95f1b5a985790d03daff6ee97bd3b22205684
parent06badfff71f5f2bf3ab4945e6edbd8471517f557
Merge commit 'rob/master' into experimental