Commit 21c537ee7efbb11089416d28ec4bd22423896e94

Ralf Wildenhues 2009-09-18T20:15:28

Merge branch 'maint'