Merged revisions 1216 - 1279 from trunk

tbrehm

2009-07-22 8c4aa39481bbfde2b403f4787c85c057e84f2e12

server/scripts/getmail.sh does not exist in tree e913730a7ae1888be6e245114d1e1962fcdc8c78