RE24 testing (again)

Pulled in a few more things, please re-sync and test. These were the last outstanding changes known for 2.4.10.

Thanks!

--Quanah

--

Quanah Gibson-Mount
Principal Software Engineer
Zimbra, Inc
--------------------
Zimbra ::  the leader in open source messaging and collaboration

Follow-Ups:
- Re: RE24 testing (again)
  - From: Howard Chu <hyc@symas.com>
- Re: RE24 testing (again)
  - From: Aaron Richton <richton@nbcs.rutgers.edu>
- Re: RE24 testing (again)
  - From: Dave Horsfall <daveh@coreng.com.au>
- Re: RE24 testing (again)
  - From: Jens Vagelpohl <jens@dataflake.org>