2009-03-28 Jens Alfke (merge)