Snapshot after commiting merger of the privateer branch.
Only vegastrike changed.
Authored by: klaussfreire 2006-05-22
Parent: [r10228]
Child: [r10230]