Merge Debian 3.0.33-4 and 3.0.34-1 changes.