Merge commit 'Dieterbe/experimental' into experimental
authorTom Adams <tom@holizz.com>
Sun, 7 Jun 2009 15:55:44 +0000 (16:55 +0100)
committerTom Adams <tom@holizz.com>
Sun, 7 Jun 2009 15:55:44 +0000 (16:55 +0100)

Trivial merge