merge v20060126-22-15 from 3.1 to 3.2

drt: apt.core
34 files changed