Merged revisions 2943-3026 from stable branch.

tbrehm

2012-04-05 b67344233b509c97ba118a209e82386d698ba068

config/courier/authdaemonrc does not exist in tree d13be8aa1a9c66e19e6facc6ab023b1beffab5ac