merged with boerges version
Authored by: viellieb@localhost.localdomain 2010-01-28
Parents: [007be9][964c4f]
Children: [6d9c27][7f8810][ca0c0b][e511e1]