Merged fixes for bugs 86719 and 86828 from trunk
[modest] / man /
drwxr-xr-x   ..
-rw-r--r-- 1597 Makefile.am
-rw-r--r-- 4401 modest.1