Before this patch, org-agenda-quit would delete the agenda window if
the frame had more than one window.  This patch changes that behavior
slightly so that if org-agenda-window-setup is 'current-window, the
agenda window won't be deleted.

Patch also available from:

 git://pmade.com/org-mode
 branch: pjones-agenda-quit