Author: branden Revision: 2051 Property Name: svn:log New Property Value: Merge revisions 1903:HEAD from trunk in preparation for 4.3.0.dfsg.1-9 release.