Merge commit 'Dieterbe/experimental' into scheme_handler
authorTom Adams <tom@holizz.com>
Wed, 22 Jul 2009 13:18:56 +0000 (14:18 +0100)
committerTom Adams <tom@holizz.com>
Wed, 22 Jul 2009 13:18:56 +0000 (14:18 +0100)

Trivial merge