Code

Merged branch 'squeeze' into lenny-backports.