Merge commit 'Dieterbe/experimental' into new_experimental
authorTom Adams <tom@holizz.com>
Sun, 12 Jul 2009 20:50:28 +0000 (21:50 +0100)
committerTom Adams <tom@holizz.com>
Sun, 12 Jul 2009 20:50:28 +0000 (21:50 +0100)

Trivial merge