Merge commit 'Dieterbe/experimental' into new_experimental
authorTom Adams <tom@holizz.com>
Sat, 11 Jul 2009 11:12:18 +0000 (12:12 +0100)
committerTom Adams <tom@holizz.com>
Sat, 11 Jul 2009 11:12:18 +0000 (12:12 +0100)

Trivial merge