Merge Debian 3.0.33-2 and 3.0.33-3 changes.