Merge branch 'dieter/experimental' into experimental
authorBarrucadu <mike@barrucadu.co.uk>
Mon, 27 Apr 2009 19:34:52 +0000 (20:34 +0100)
committerBarrucadu <mike@barrucadu.co.uk>
Mon, 27 Apr 2009 19:34:52 +0000 (20:34 +0100)

Trivial merge