Merge commit 'Dieterbe/experimental' into experimental
authorTom Adams <tom@holizz.com>
Mon, 8 Jun 2009 08:34:17 +0000 (09:34 +0100)
committerTom Adams <tom@holizz.com>
Mon, 8 Jun 2009 08:34:17 +0000 (09:34 +0100)

Trivial merge