Merged revisions 1832-1836 from stable (added dovecot support for debian...

Merged revisions 1832-1836 from stable (added dovecot support for debian squeeze and added a new distid and class for debian6 specific modifications.