[@sambauers Participant 16 years ago]

Changes are now in trunk, please test.

0.9 may be a little more hackish to implement.